Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 3454)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 3455)
@@ -275,8 +275,8 @@
      * @param mapMode   The new mode to set.
      */
-    public boolean selectMapMode(MapMode newMapMode) {
+    public void selectMapMode(MapMode newMapMode) {
         MapMode oldMapMode = this.mapMode;
         if (newMapMode == oldMapMode)
-            return false;
+            return;
         if (oldMapMode != null) {
             oldMapMode.exitMode();
@@ -286,5 +286,4 @@
         lastMapMode.put(mapView.getActiveLayer(), newMapMode);
         fireMapModeChanged(oldMapMode, newMapMode);
-        return true;
     }
 
@@ -383,6 +382,7 @@
         if (mapMode == null || !mapMode.layerIsSupported(newLayer)) {
             MapMode newMapMode = lastMapMode.get(newLayer);
+            modeChanged = newMapMode != mapMode;
             if (newMapMode != null) {
-                modeChanged = selectMapMode(newMapMode);
+                selectMapMode(newMapMode);
             } // it would be nice to select first supported mode when layer is first selected, but it don't work well with for example editgpx layer
         }