Index: applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java
===================================================================
--- applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java	(revision 24674)
+++ applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java	(revision 24675)
@@ -35,4 +35,5 @@
     EastNorth prevEastNorth;
     private ImageryLayer layer;
+    private MapMode oldMapMode;
 
     public ImageryAdjustAction(ImageryLayer layer) {
@@ -102,6 +103,7 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (offsetDialog != null || layer == null)
+        if (offsetDialog != null || layer == null || Main.map == null)
             return;
+        oldMapMode = Main.map.mapMode;
         super.actionPerformed(e);
     }
@@ -156,5 +158,5 @@
             super.buttonAction(buttonIndex, evt);
             offsetDialog = null;
-            if (buttonIndex == 2) {
+            if (buttonIndex == 1) {
                 layer.setOffset(oldDx, oldDy);
             } else if (tBookmarkName.getText() != null && !"".equals(tBookmarkName.getText())) {
@@ -167,5 +169,11 @@
             }
             ImageryPlugin.instance.refreshOffsetMenu();
-            Main.map.selectSelectTool(false);
+            if (Main.map == null) return;
+            if (oldMapMode != null) {
+                Main.map.selectMapMode(oldMapMode);
+                oldMapMode = null;
+            } else {
+                Main.map.selectSelectTool(false);
+            }
         }
     }