Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java	(revision 16564)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java	(revision 16565)
@@ -61,6 +61,7 @@
         component = combobox;
         combobox.setRenderer(getListCellRenderer());
-        combobox.setEditable(editable);
+        combobox.setEditable(true); // fix incorrect height, see #6157
         combobox.reinitialize(presetListEntries);
+        combobox.setEditable(editable); // see #6157
         AutoCompletingTextField tf = new AutoCompletingTextField();
         initAutoCompletionField(tf, key);