Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 15655)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 15657)
@@ -187,5 +187,5 @@
     private JCheckBoxMenuItem addMenuItem() {
         int n = MainApplication.getMenu().editMenu.getItemCount();
-        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, snapChangeAction, n-5, false);
+        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, snapChangeAction, n >= 5 ? n-5 : -1, false);
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 15655)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 15657)
@@ -245,5 +245,5 @@
     private JCheckBoxMenuItem addDualAlignMenuItem() {
         int n = MainApplication.getMenu().editMenu.getItemCount();
-        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, dualAlignChangeAction, n-5, false);
+        return MainMenu.addWithCheckbox(MainApplication.getMenu().editMenu, dualAlignChangeAction, n >= 5 ? n-5 : -1, false);
     }