Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java	(revision 13776)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryDialog.java	(revision 13777)
@@ -18,6 +18,4 @@
 public class AddImageryDialog extends ExtendedDialog implements ContentValidationListener {
 
-    private final String saveGeometryEntryName;
-
     /**
      * Constructs a new AddImageryDialog.
@@ -33,5 +31,8 @@
         setMinimumSize(new Dimension(300, 400));
         panel.addContentValidationListener(this);
-        this.saveGeometryEntryName = panel.getClass().getName() + ".geometry";
+        setRememberWindowGeometry(
+                panel.getClass().getName() + ".geometry",
+                WindowGeometry.centerInWindow(Main.parent, new Dimension(400, 600))
+                );
     }
 
@@ -46,14 +47,3 @@
         buttons.get(0).setEnabled(isValid);
     }
-
-    @Override
-    public void setVisible(boolean visible) {
-        if (visible) {
-            new WindowGeometry(saveGeometryEntryName, WindowGeometry.centerInWindow(Main.parent,
-                    new Dimension(800, 600))).applySafe(this);
-        } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
-            new WindowGeometry(this).remember(saveGeometryEntryName);
-        }
-        super.setVisible(visible);
-    }
 }