Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 5639)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 5640)
@@ -523,7 +523,8 @@
                     public void actionPerformed(ActionEvent e) {
                         keys.setSelectedItem(t.getKey());
+                        // Update list of values (fix #7951) 
+                        // fix #8298 - update list of values before setting value (?)
+                        focus.focusGained(null);
                         values.setSelectedItem(t.getValue());
-                        // Update list of values (fix #7951) 
-                        focus.focusGained(null);
                     }
                 };