Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 2719)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 2720)
@@ -237,4 +237,9 @@
                 layer.hook_up_mouse_events(); // Main.map.mapView should exist
                 // now. Can add mouse listener
+                Main.map.mapView.addPropertyChangeListener(layer);
+                if (!addedToggleDialog) {
+                    Main.map.addToggleDialog(ImageViewerDialog.getInstance());
+                    addedToggleDialog = true;
+                }
 
                 if (! cancelled && layer.data.size() > 0) {
@@ -262,8 +267,4 @@
         Loader loader = new Loader(files, gpxLayer);
         Main.worker.execute(loader);
-        if (!addedToggleDialog) {
-            Main.map.addToggleDialog(ImageViewerDialog.getInstance());
-            addedToggleDialog = true;
-        }
     }
 
@@ -275,5 +276,4 @@
         this.data = data;
         this.gpxLayer = gpxLayer;
-        Main.map.mapView.addPropertyChangeListener(this);
     }