Index: /applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustMapMode.java
===================================================================
--- /applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustMapMode.java	(revision 32711)
+++ /applications/editors/josm/plugins/photoadjust/src/org/openstreetmap/josm/plugins/photoadjust/PhotoAdjustMapMode.java	(revision 32712)
@@ -55,6 +55,4 @@
         initAdapters();
         this.worker = worker;
-        Main.getLayerManager().addLayerChangeListener(this);
-        Main.getLayerManager().addActiveLayerChangeListener(this);
     }
 
@@ -135,7 +133,9 @@
         super.enterMode();
         modeSelected = true;
-        // Activate the mode only if the current layer is not a
-        // GeoImageLayer.  GeoImageLayer's are handled by the plug-in directly.
-        if (! (Main.getLayerManager().getActiveLayer() instanceof GeoImageLayer)) {
+        Main.getLayerManager().addLayerChangeListener(this);
+        Main.getLayerManager().addActiveLayerChangeListener(this);
+        // Activate the mode only if the current layer is not a GeoImageLayer.
+        // GeoImageLayer's are handled by the plug-in directly.
+        if (!(Main.getLayerManager().getActiveLayer() instanceof GeoImageLayer)) {
             activateMode();
         }