diff --git a/platform/util/src/com/intellij/openapi/wm/FocusWatcher.java b/platform/util/src/com/intellij/openapi/wm/FocusWatcher.java
index 991c1f9fe706..f921da45aa11 100644
--- a/platform/util/src/com/intellij/openapi/wm/FocusWatcher.java
+++ b/platform/util/src/com/intellij/openapi/wm/FocusWatcher.java
@@ -89,6 +89,7 @@ public class FocusWatcher implements ContainerListener,FocusListener{
     if(getFocusedComponent() ==component){
       setFocusedComponentImpl(null, cause);
     }
+    myTopComponent = null;
   }
 
   @Override