diff --git a/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java b/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java
index 3b03f7f77c..03ec845ed3 100644
--- a/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java
+++ b/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import javax.swing.text.JTextComponent;
 
+import org.openstreetmap.josm.data.tagging.ac.AutoCompletionItem;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.spi.preferences.Config;
 
@@ -54,7 +55,14 @@ public class HistoryComboBox extends AutoCompletingComboBox {
      * @see ComboBoxHistory#addElement(java.lang.String)
      */
     public void addCurrentItemToHistory() {
-        model.addElement((String) getEditor().getItem());
+        Object item = getEditor().getItem();
+        if (item instanceof String) {
+            model.addElement((String) item);
+        } else if (item instanceof AutoCompletionItem) {
+            model.addElement(((AutoCompletionItem) item).getValue());
+        } else {
+            throw new IllegalArgumentException(item.getClass().getSimpleName() + " is not supported in addCurrentItemToHistory");
+        }
     }
 
     /**