diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index 67ea2991c..d5d2d9c88 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -174,13 +174,15 @@ public final class RichInputConnection {
         }
         final int lengthOfTextBeforeCursor = mCommittedTextBeforeComposingText.length();
         if (lengthOfTextBeforeCursor > newSelStart
-                || (lengthOfTextBeforeCursor < Constants.EDITOR_CONTENTS_CACHE_SIZE
+                || (newSelStart != lengthOfTextBeforeCursor
+                        && lengthOfTextBeforeCursor < Constants.EDITOR_CONTENTS_CACHE_SIZE
                         && newSelStart < Constants.EDITOR_CONTENTS_CACHE_SIZE)) {
             // newSelStart and newSelEnd may be lying -- when rotating the device (probably a
-            // framework bug). If we have less chars than we asked for, then we know how many chars
-            // we have, and if we got more than newSelStart says, then we know it was lying. In both
-            // cases the length is more reliable.  Note that we only have to check newSelStart (not
-            // newSelEnd) since if newSelEnd is wrong, the newSelStart will be wrong as well.
+            // framework bug). If the values don't agree and we have less chars than we asked
+            // for, then we know how many chars we have. If we got more than newSelStart says, then
+            // we also know it was lying. In both cases the length is more reliable. Note that we
+            // only have to check newSelStart (not newSelEnd) since if newSelEnd is wrong, then
+            // newSelStart will be wrong as well.
             mExpectedSelStart = lengthOfTextBeforeCursor;
             mExpectedSelEnd = lengthOfTextBeforeCursor;
         }