Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 9408)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 9409)
@@ -1789,4 +1789,9 @@
             }
         }
+
+        @Override
+        protected void updateEnabledState() {
+            setEnabled(Main.main != null && Main.main.hasEditLayer());
+        }
     }
 }
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 9408)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 9409)
@@ -198,4 +198,9 @@
         public void actionPerformed(ActionEvent e) {
             toggleDualAlign();
+        }
+
+        @Override
+        protected void updateEnabledState() {
+            setEnabled(Main.main != null && Main.main.hasEditLayer());
         }
     }