Index: /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java
===================================================================
--- /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java	(revision 30608)
+++ /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java	(revision 30609)
@@ -22,4 +22,5 @@
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -29,5 +30,4 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 import javax.swing.table.DefaultTableCellRenderer;
@@ -195,5 +195,6 @@
             sp.setViewportView(propertyTable);
 
-            final JTextField newTagField = new JTextField();
+            final JComboBox<String> newTagField = new JComboBox<>(new String[]{
+                    "opening_hours", "collection_times", "collection_times:local", "service_times", "lit"});
 
             JRadioButton editButton = new JRadioButton(new AbstractAction(tr("edit existing tag")) {
@@ -250,5 +251,5 @@
                 propertyTable.setEnabled(false);
                 newTagField.setEnabled(true);
-                newTagField.setText(preSelectedKey);
+                newTagField.setSelectedItem(preSelectedKey);
                 newButton.setSelected(true);
             }
@@ -284,5 +285,5 @@
                     valuesToEdit = propertyData.getValueAt(propertyTable.getSelectedRow(), 1);
                 } else if (newButton.isSelected()) {
-                    keyToEdit = newTagField.getText();
+                    keyToEdit = newTagField.getSelectedItem().toString();
                 }
             if (keyToEdit == null)