Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 18080)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 18098)
@@ -158,5 +158,4 @@
             }
 
-            setSelectedItem(item);
             if (initial) {
                 start = 0;
@@ -168,4 +167,5 @@
                     super.remove(0, size);
                     super.insertString(0, newText, a);
+                    AutoCompletingComboBox.this.setSelectedItem(item);
                     selecting = false;
                     start = size;
@@ -185,10 +185,4 @@
                 editorComponent.select(start, end);
             }
-        }
-
-        private void setSelectedItem(Object item) {
-            selecting = true;
-            AutoCompletingComboBox.this.setSelectedItem(item);
-            selecting = false;
         }