diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index a6cf312d2..d72710e5b 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -673,6 +673,7 @@ public class LatinIME extends InputMethodService
     }
 
     private void handleShift() {
+        mHandler.removeMessages(MSG_UPDATE_SHIFT_STATE);
         Keyboard currentKeyboard = mInputView.getKeyboard();
         if (mKeyboardSwitcher.isAlphabetMode()) {
             // Alphabet keyboard