Ticket #15558: 15558-v2.patch

src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -297 +297 @@
         for (String elem : elems) {
             model.addElement(new AutoCompletionItem(elem, AutoCompletionPriority.UNKNOWN));
         }
+        this.setSelectedItem(null);
         // disable autocomplete to prevent unnecessary actions in AutoCompletingComboBoxDocument#insertString
         autocompleteEnabled = false;
-        this.getEditor().setItem(oldValue); // Do not use setSelectedItem(oldValue); (fix #8013)
+        this.setSelectedItem(oldValue);
         autocompleteEnabled = true;
     }