diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupDispatcher.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupDispatcher.java
index 836967cc999e..3d2d52a6a19d 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/PopupDispatcher.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupDispatcher.java
@@ -130,8 +130,15 @@ public class PopupDispatcher implements AWTEventListener, KeyEventDispatcher, Id
   }
 
   public static void unsetShowing(WizardPopup aBaseWizardPopup) {
-    ourShowingStep = aBaseWizardPopup.getParent();
-  }
+    if (ourActiveWizardRoot != null) {
+      for (WizardPopup wp = aBaseWizardPopup; wp != null; wp = wp.getParent()) {
+        if (wp == ourActiveWizardRoot) {
+          ourShowingStep = aBaseWizardPopup.getParent();
+          return;
+        }
+      }
+    }
+   }
 
   public static WizardPopup getActiveRoot() {
     return ourActiveWizardRoot;