Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 9443)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 9444)
@@ -1792,5 +1792,5 @@
         @Override
         protected void updateEnabledState() {
-            setEnabled(Main.main != null && Main.main.hasEditLayer());
+            setEnabled(Main.map != null && Main.map.mapMode instanceof DrawAction);
         }
     }
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 9443)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 9444)
@@ -202,5 +202,5 @@
         @Override
         protected void updateEnabledState() {
-            setEnabled(Main.main != null && Main.main.hasEditLayer());
+            setEnabled(Main.map != null && Main.map.mapMode instanceof ExtrudeAction);
         }
     }