diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index cb1ff41..fa71eea 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1459,26 +1459,21 @@
     }
 
     public void switchToKeyboardView() {
-        mHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                if (DEBUG) {
-                    Log.d(TAG, "Switch to keyboard view.");
-                }
-                View v = mKeyboardSwitcher.getInputView();
-                if (v != null) {
-                    // Confirms that the keyboard view doesn't have parent view.
-                    ViewParent p = v.getParent();
-                    if (p != null && p instanceof ViewGroup) {
-                        ((ViewGroup) p).removeView(v);
-                    }
-                    setInputView(v);
-                }
-                setCandidatesViewShown(isCandidateStripVisible());
-                updateInputViewShown();
-                mHandler.postUpdateSuggestions();
+        if (DEBUG) {
+            Log.d(TAG, "Switch to keyboard view.");
+        }
+        View v = mKeyboardSwitcher.getInputView();
+        if (v != null) {
+            // Confirms that the keyboard view doesn't have parent view.
+            ViewParent p = v.getParent();
+            if (p != null && p instanceof ViewGroup) {
+                ((ViewGroup) p).removeView(v);
             }
-        });
+            setInputView(v);
+        }
+        setCandidatesViewShown(isCandidateStripVisible());
+        updateInputViewShown();
+        mHandler.postUpdateSuggestions();
     }
 
     public void clearSuggestions() {
