diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index b7584d4cd..7fc68e061 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -1029,6 +1029,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy,
         cancelAllMessages();
         onCancelMoreKeysPanel();
         mInvalidateAllKeys = true;
+        mKeyboard = null;
         requestLayout();
     }
 
@@ -1062,11 +1063,6 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy,
         return false;
     }
 
-    public void purgeKeyboardAndClosing() {
-        mKeyboard = null;
-        closing();
-    }
-
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();