diff --git a/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java b/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
index 6ca0f930bc7b..e20f02484fb0 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorComboBox.java
@@ -86,7 +86,7 @@ public class EditorComboBox extends JComboBox implements DocumentListener {
 
     addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        final Editor editor = myEditorField.getEditor();
+        final Editor editor = myEditorField != null ? myEditorField.getEditor() : null;
         if (editor != null) {
           editor.getSelectionModel().removeSelection();
         }