diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java
index a0f104103b712..6442406fff401 100644
--- a/core/java/android/view/WindowManagerImpl.java
+++ b/core/java/android/view/WindowManagerImpl.java
@@ -340,6 +340,14 @@ public class WindowManagerImpl implements WindowManager {
             View curView = root.getView();
             
             root.mAddNesting = 0;
+
+            if (view != null) {
+                InputMethodManager imm = InputMethodManager.getInstance(view.getContext());
+                if (imm != null) {
+                    imm.windowDismissed(mViews[index].getWindowToken());
+                }
+            }
+
             root.die(true);
             finishRemoveViewLocked(curView, index);
             if (curView == view) {
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 067be39db6e07..1803352ecaf4a 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -672,6 +672,7 @@ public final class InputMethodManager {
      * Disconnect any existing input connection, clearing the served view.
      */
     void finishInputLocked() {
+        mCurRootView = null;
         mNextServedView = null;
         if (mServedView != null) {
             if (DEBUG) Log.v(TAG, "FINISH INPUT: " + mServedView);