diff --git a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
index 34efc7f313cc..d88b36a2e51d 100644
--- a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
@@ -335,6 +335,8 @@ public class IdeEventQueue extends EventQueue {
 
     if (isMetaKeyPressedOnLinux(e)) return;
 
+    if (e.getSource() instanceof TrayIcon) return;
+
     checkForTimeJump();
 
     if (!appIsLoaded()) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
index 3879dd0471cb..425ec69467fe 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
@@ -124,11 +124,6 @@ public final class IdeMouseEventDispatcher {
   public boolean dispatchMouseEvent(MouseEvent e) {
     Component c = e.getComponent();
 
-    // dispatch tray events by default
-    if (c == null && e.getSource() instanceof TrayIcon) {
-      return false;
-    }
-
     //frame activation by mouse click
     if (e.getID() == MOUSE_PRESSED && c instanceof IdeFrame && !c.hasFocus()) {
       IdeFocusManager focusManager = IdeFocusManager.getGlobalInstance();