Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 2653)
+++ /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 2654)
@@ -631,7 +631,6 @@
         Layer old = activeLayer;
         activeLayer = layer;
+        setEditLayer();
         fireActiveLayerChanged(old, layer);
-
-        setEditLayer();
 
         /* This only makes the buttons look disabled. Disabling the actions as well requires