diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
index c962255..543e1b0 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
@@ -31,8 +31,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -65,6 +65,8 @@ import javax.swing.text.JTextComponent;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
+import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
@@ -102,8 +104,6 @@ import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
-import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 
 /**
  * This dialog displays the properties of the current selected primitives.
@@ -378,6 +378,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
                 }
         }
         propertyTable.changeSelection(row, 0, false, false);
+        propertyTable.requestFocusInWindow();
     }
 
     /**
@@ -487,7 +488,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
         lastAddKey = key;
         lastAddValue = value;
         Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
-        btnAdd.requestFocusInWindow();
+        propertyTable.requestFocusInWindow(); // necessary?
     }
 
     /**
@@ -788,9 +789,11 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi
 
         // -- add action and shortcut
         this.btnAdd = new SideButton(addAction);
-        btnAdd.setFocusable(true);
-        btnAdd.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "onEnter");
-        btnAdd.getActionMap().put("onEnter", addAction);
+        getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "onEnter");
+        getActionMap().put("onEnter", addAction);
+        // disable the default enter keybinding in the tables:
+        propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "none");
+        
 
         // -- edit action
         //