diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index 5a9cde170b709..2b15afdde9eaa 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -427,6 +427,7 @@ public class InputMethodService extends AbstractInputMethodService {
                 } catch (BadTokenException e) {
                     if (DEBUG) Log.v(TAG, "BadTokenException: IME is done.");
                     mWindowVisible = false;
+                    mWindowAdded = false;
                 }
             }
             // If user uses hard keyboard, IME button should always be shown.