diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index dcbbfca09..9d52f3a70 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -824,6 +824,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
         }
         // Remove pending messages related to update suggestions
         mHandler.cancelUpdateSuggestionStrip();
+        resetComposingState(true /* alsoResetLastComposedWord */);
     }
 
     @Override