Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 9445)
+++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 9446)
@@ -599,11 +599,12 @@
     }
 
-    /**
-     * Don't check, if the current selection is suited for orthogonalization.
-     * Instead, show a usage dialog, that explains, why it cannot be done.
-     */
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null);
+        setEnabled(getCurrentDataSet() != null && !getCurrentDataSet().getSelected().isEmpty());
+    }
+
+    @Override
+    protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+        setEnabled(selection != null && !selection.isEmpty());
     }
 }