Index: /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java
===================================================================
--- /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java	(revision 35473)
+++ /applications/editors/josm/plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java	(revision 35474)
@@ -33,5 +33,5 @@
                 Shortcut.registerShortcut("tools:alignways", tr("Tool: {0}", tr("Align Ways")),
                                 KeyEvent.VK_SPACE, Shortcut.SHIFT),
-                true);
+                true, false);
         setEnabled(false);
     }
Index: /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingRectangleAction.java
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingRectangleAction.java	(revision 35473)
+++ /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingRectangleAction.java	(revision 35474)
@@ -17,5 +17,5 @@
                         tr("Data: {0}", tr("Set buildings shape to rectangle")),
                         KeyEvent.VK_R, Shortcut.ALT),
-                true);
+                true, false);
     }
 
Index: /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingSizeAction.java
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingSizeAction.java	(revision 35473)
+++ /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingSizeAction.java	(revision 35474)
@@ -16,5 +16,5 @@
                 Shortcut.registerShortcut("edit:buildingsdialog", tr("Edit: {0}", tr("Set buildings size")),
                 KeyEvent.VK_B, Shortcut.ALT_CTRL),
-                true, "edit:buildingsdialog", true);
+                true, "edit:buildingsdialog", false);
     }
 
Index: /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java
===================================================================
--- /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java	(revision 35473)
+++ /applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/MergeAddrPointsAction.java	(revision 35474)
@@ -114,5 +114,5 @@
             int oldMulti = multi;
             for (Node n : addrNodes) {
-                if (Geometry.nodeInsidePolygon(n, w.getNodes()))
+                if (Geometry.nodeInsidePolygon(n, w.getNodes())) {
                     if (mergeNode != null) {
                         multi++;
@@ -120,6 +120,8 @@
                         // skipping
                         break;
-                    } else
+                    } else {
                         mergeNode = n;
+                    }
+                }
             }
             if (oldMulti != multi)
@@ -180,4 +182,9 @@
 
     @Override
+    protected boolean listenToSelectionChange() {
+        return false;
+    }
+
+    @Override
     protected void updateEnabledState() {
         setEnabled(getLayerManager().getEditDataSet() != null);
Index: /applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java
===================================================================
--- /applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java	(revision 35473)
+++ /applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java	(revision 35474)
@@ -19,5 +19,5 @@
         super(tr("Revert changeset"), "revert-changeset", tr("Revert changeset"),
             Shortcut.registerShortcut("tool:revert", tr("Tool: {0}", tr("Revert changeset")), KeyEvent.VK_T, Shortcut.CTRL_SHIFT),
-                true);
+                true, false);
     }
 
Index: /applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java
===================================================================
--- /applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java	(revision 35473)
+++ /applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java	(revision 35474)
@@ -236,6 +236,8 @@
      */
     public UndeleteAction() {
-        super(tr("Undelete object..."), "undelete", tr("Undelete object by id"),
-                Shortcut.registerShortcut("tools:undelete", tr("File: {0}", tr("Undelete object...")), KeyEvent.VK_U, Shortcut.ALT_SHIFT), true);
+		super(tr("Undelete object..."), "undelete", tr("Undelete object by id"),
+				Shortcut.registerShortcut("tools:undelete", tr("File: {0}", tr("Undelete object...")), KeyEvent.VK_U,
+						Shortcut.ALT_SHIFT),
+				true, false);
     }