diff --git a/library/src/com/wrapp/floatlabelededittext/FloatLabeledEditText.java b/library/src/com/wrapp/floatlabelededittext/FloatLabeledEditText.java
index bbe777a..7cf31bf 100644
--- a/library/src/com/wrapp/floatlabelededittext/FloatLabeledEditText.java
+++ b/library/src/com/wrapp/floatlabelededittext/FloatLabeledEditText.java
@@ -119,7 +119,6 @@ private void setEditText(EditText editText) {
 
             @Override
             public void afterTextChanged(Editable s) {
-                setShowHint(!TextUtils.isEmpty(s));
             }
 
             @Override
@@ -128,6 +127,15 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.length() == 0) {
+                    if (before == 1) {
+                        setShowHint(false);
+                    } else if (before > 1) {
+                        setShowHint(true);
+                    }
+                } else {
+                    setShowHint(!TextUtils.isEmpty(s));
+                }
             }
 
         });