Index: trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 13693)
+++ trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 13694)
@@ -169,4 +169,5 @@
         case KeyEvent.VK_ESCAPE:
             if (offsetDialog != null) {
+                restoreOldMode = true;
                 offsetDialog.setVisible(false);
                 return;
@@ -365,5 +366,5 @@
                 return;
             if (oldMapMode != null) {
-                if (restoreOldMode) {
+                if (restoreOldMode || getValue() == ExtendedDialog.DialogClosedOtherwise) {
                     map.selectMapMode(oldMapMode);
                 }