diff --git a/maui/src/TextInputLayout/SfTextInputLayout.Methods.cs b/maui/src/TextInputLayout/SfTextInputLayout.Methods.cs
index 0bf4feb6..02087598 100644
--- a/maui/src/TextInputLayout/SfTextInputLayout.Methods.cs
+++ b/maui/src/TextInputLayout/SfTextInputLayout.Methods.cs
@@ -160,6 +160,7 @@ internal void OnTextInputViewTextChanged(object? sender, TextChangedEventArgs e)
                 {
                     if (!IsHintAlwaysFloated)
                     {
+                        IsHintFloated = false;
                         IsHintDownToUp = true;
                         InvalidateDrawable();
                     }
@@ -173,7 +174,7 @@ internal void OnTextInputViewTextChanged(object? sender, TextChangedEventArgs e)
 
                 // Clear icon can't draw when isClearIconVisible property updated based on text.
                 // So here call the InvalidateDrawable to draw the clear icon.
-                if (Text.Length == 1 || Text.Length == 0)
+                if (Text?.Length <= 1)
                 {
                     InvalidateDrawable();
                 }