diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java
index 2d78adde928f..1c91a8662140 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java
@@ -429,9 +429,9 @@ public class IdeGlassPaneImpl extends JPanel implements IdeGlassPaneEx, IdeEvent
     }
 
     IdeEventQueue queue = IdeEventQueue.getInstance();
-    if (!queue.containsDispatcher(this) && myPreprocessorActive) {
+    if (!queue.containsDispatcher(this) && (myPreprocessorActive || isVisible())) {
       queue.addDispatcher(this, null);
-    } else if (queue.containsDispatcher(this) && !myPreprocessorActive) {
+    } else if (queue.containsDispatcher(this) && !myPreprocessorActive && !isVisible()) {
       queue.removeDispatcher(this);
     }