Index: trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 11651)
+++ trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 11652)
@@ -70,6 +70,15 @@
         old = layer.getDisplaySettings().getDisplacement();
         addListeners();
-        offsetDialog = new ImageryOffsetDialog();
+        showOffsetDialog(new ImageryOffsetDialog());
+    }
+
+    private static void showOffsetDialog(ImageryOffsetDialog dlg) {
+        offsetDialog = dlg;
         offsetDialog.setVisible(true);
+    }
+
+    private static void hideOffsetDialog() {
+        offsetDialog.setVisible(false);
+        offsetDialog = null;
     }
 
@@ -91,7 +100,6 @@
                 layer.getDisplaySettings().setDisplacement(old);
             }
-            offsetDialog.setVisible(false);
+            hideOffsetDialog();
             // do not restore old mode here - this is called when the new mode is already known.
-            offsetDialog = null;
         }
         removeListeners();