Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 5020)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 5021)
@@ -651,5 +651,5 @@
                 if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
                     // selected osm primitives are untagged or filling default feature is enabled
-                    combo.setSelectedItem(def);
+                    combo.setSelectedItem(lhm.get(def).display_value);
                 } else {
                     // selected osm primitives are tagged and filling default feature is disabled
