Index: src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 5662)
+++ src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(working copy)
@@ -41,6 +41,7 @@
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.ImageIcon;
@@ -230,7 +231,7 @@
             this.m = map;
             
             JPanel mainPanel = new JPanel(new BorderLayout());
-                    
+            mainPanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
             String msg = "<html>"+trn("This will change {0} object.",
                     "This will change up to {0} objects.", sel.size(), sel.size())
                     +"<br><br>("+tr("An empty value deletes the tag.", key)+")</html>";
@@ -249,6 +250,7 @@
             keys.setEditable(true);
             keys.setSelectedItem(key);
 
+            p.add(Box.createVerticalStrut(5),GBC.eol());
             p.add(new JLabel(tr("Key")), GBC.std());
             p.add(Box.createHorizontalStrut(10), GBC.std());
             p.add(keys, GBC.eol().fill(GBC.HORIZONTAL));
@@ -265,6 +267,7 @@
             values.setPossibleACItems(valueList);
             values.setSelectedItem(selection);
             values.getEditor().setItem(selection);
+            p.add(Box.createVerticalStrut(5),GBC.eol());
             p.add(new JLabel(tr("Value")), GBC.std());
             p.add(Box.createHorizontalStrut(10), GBC.std());
             p.add(values, GBC.eol().fill(GBC.HORIZONTAL));
@@ -463,6 +466,7 @@
             JPanel mainPanel = new JPanel(new GridBagLayout());
             keys = new AutoCompletingComboBox();
             values = new AutoCompletingComboBox();
+            mainPanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
             
             mainPanel.add(new JLabel("<html>"+trn("This will change up to {0} object.",
                 "This will change up to {0} objects.", sel.size(),sel.size())
