Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 8947)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 8949)
@@ -141,9 +141,9 @@
     // Map modes
     public final SelectAction mapModeSelect;
+    public final DrawAction mapModeDraw;
+    public final ZoomAction mapModeZoom;
     public LassoModeAction mapModeSelectLasso;
 
     private final transient Map<Layer, MapMode> lastMapMode = new HashMap<>();
-    private final MapMode mapModeDraw;
-    private final MapMode mapModeZoom;
 
     /**