diff --git a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
index c6b4027..9f9db0a 100644
--- a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
+++ b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
@@ -124,6 +124,16 @@ public final class OrthogonalizeAction extends JosmAction {
                         .show();
             }
         }
+
+        @Override
+        protected void updateEnabledState() {
+            updateEnabledStateOnCurrentSelection();
+        }
+
+        @Override
+        protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+            setEnabled(selection != null && !selection.isEmpty());
+        }
     }
 
     @Override
@@ -617,8 +627,7 @@ public final class OrthogonalizeAction extends JosmAction {
 
     @Override
     protected void updateEnabledState() {
-        DataSet ds = getLayerManager().getEditDataSet();
-        setEnabled(ds != null && !ds.selectionEmpty());
+        updateEnabledStateOnCurrentSelection();
     }
 
     @Override