Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 4175)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 4176)
@@ -78,11 +78,12 @@
                     if (curText.length() != 0)
                         Long.parseLong(curText);
+                    item = lookupItem(curText, true);
                 } catch (NumberFormatException e) {
                     // either the new text or the current text isn't a number. We continue with
                     // autocompletion
-                    item = lookupItem(curText);
+                    item = lookupItem(curText, false);
                 }
             } else {
-                item = lookupItem(curText);
+                item = lookupItem(curText, false);
             }
 
@@ -114,5 +115,5 @@
         }
 
-        private Object lookupItem(String pattern) {
+        private Object lookupItem(String pattern, boolean match) {
             ComboBoxModel model = comboBox.getModel();
             AutoCompletionListItem bestItem = null;
@@ -122,5 +123,5 @@
                     return currentItem;
                 }
-                if (currentItem.getValue().startsWith(pattern)) {
+                if (!match && currentItem.getValue().startsWith(pattern)) {
                     if (bestItem == null || currentItem.getPriority().compareTo(bestItem.getPriority()) > 0) {
                         bestItem = currentItem;