diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
index 142957886db8..df0e1d949026 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
@@ -188,7 +188,8 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
         if (rectangle.contains(eventPoint)) {
           MouseEvent event = SwingUtilities.convertMouseEvent(e.getComponent(), e, myPopup.getContent());
           Component component = SwingUtilities.getDeepestComponentAt(content, event.getX(), event.getY());
-          component.dispatchEvent(event);
+          if (component != null)
+            component.dispatchEvent(event);
         }
       }
     }