Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 11115)
+++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 11116)
@@ -26,5 +26,4 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -124,4 +123,14 @@
                         .show();
             }
+        }
+
+        @Override
+        protected void updateEnabledState() {
+            updateEnabledStateOnCurrentSelection();
+        }
+
+        @Override
+        protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+            setEnabled(selection != null && !selection.isEmpty());
         }
     }
@@ -618,6 +627,5 @@
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.selectionEmpty());
+        updateEnabledStateOnCurrentSelection();
     }