Index: trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 2488)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 2489)
@@ -569,5 +569,5 @@
 
         EditAction editAction = new EditAction();
-        membershipTable.getSelectionModel().addListSelectionListener(editAction);
+        propertyTable.getSelectionModel().addListSelectionListener(editAction);
         this.btnEdit = new SideButton(editAction);
         buttonPanel.add(this.btnEdit);
@@ -788,4 +788,7 @@
     }
 
+    /* ---------------------------------------------------------------------------------- */
+    /* LayerChangeListener                                                                */
+    /* ---------------------------------------------------------------------------------- */
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
         if (newLayer instanceof OsmDataLayer) {
@@ -805,5 +808,4 @@
         // do nothing
     }
-
 
     class DeleteAction extends AbstractAction implements ListSelectionListener {
@@ -899,12 +901,10 @@
             if (!isEnabled())
                 return;
-            int row = membershipTable.getSelectedRow();
-            if (e.getActionCommand().equals("Edit")) {
-                propertyEdit(row >= 0 ? row : 0);
-            }
+            int row = propertyTable.getSelectedRow();
+            propertyEdit(row >= 0 ? row : 0);
         }
 
         protected void updateEnabledState() {
-            setEnabled(membershipTable.getSelectedRowCount() == 1);
+            setEnabled(propertyTable.getSelectedRowCount() == 1);
         }