Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java	(revision 6016)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java	(revision 6017)
@@ -15,4 +15,5 @@
 
 import javax.accessibility.Accessible;
+import javax.swing.ComboBoxEditor;
 import javax.swing.ComboBoxModel;
 import javax.swing.DefaultComboBoxModel;
@@ -218,9 +219,12 @@
         private void enableMenu() {
             if (launcher == null) {
-                Component editorComponent = getEditor().getEditorComponent();
-                if (editorComponent instanceof JTextComponent) {
-                    component = (JTextComponent) editorComponent;
-                    component.addMouseListener(this);
-                    launcher = TextContextualPopupMenu.enableMenuFor(component);
+                ComboBoxEditor editor = getEditor();
+                if (editor != null) {
+                    Component editorComponent = editor.getEditorComponent();
+                    if (editorComponent instanceof JTextComponent) {
+                        component = (JTextComponent) editorComponent;
+                        component.addMouseListener(this);
+                        launcher = TextContextualPopupMenu.enableMenuFor(component);
+                    }
                 }
             }