Index: trunk/src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java	(revision 432)
+++ trunk/src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java	(revision 433)
@@ -51,9 +51,12 @@
 				super.remove(0, getLength());
 				super.insertString(0, item.toString(), a);
-				// select the completed part
-				JTextComponent editor = (JTextComponent)comboBox.getEditor().getEditorComponent();
-				editor.setSelectionStart(offs + str.length());
-				editor.setSelectionEnd(getLength());
+
 			}
+			
+			// select the completed part
+			JTextComponent editor = (JTextComponent)comboBox.getEditor().getEditorComponent();
+			editor.setSelectionStart(offs + str.length());
+			editor.setSelectionEnd(getLength());
+			
 			setSelectedItem(item);
 		}