diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/watchers/ZeroIndexContentWatcher.kt b/aztec/src/main/kotlin/org/wordpress/aztec/watchers/ZeroIndexContentWatcher.kt
index f1ec4eae0..a391eb58e 100644
--- a/aztec/src/main/kotlin/org/wordpress/aztec/watchers/ZeroIndexContentWatcher.kt
+++ b/aztec/src/main/kotlin/org/wordpress/aztec/watchers/ZeroIndexContentWatcher.kt
@@ -27,7 +27,10 @@ class ZeroIndexContentWatcher(aztecText: AztecText) : TextWatcher {
 
         val aztecText = aztecTextRef.get()
         // last character was removed
-        if (aztecText != null && textChangedEventDetails.inputEnd == 0 && textChangedEventDetails.inputStart == 1) {
+        if (aztecText != null
+                && text.length == 0
+                && textChangedEventDetails.inputEnd == 0
+                && textChangedEventDetails.inputStart == 1) {
             aztecText.disableOnSelectionListener()
         }
     }