Index: core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
===================================================================
--- core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(revision 5748)
+++ core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(working copy)
@@ -26,8 +26,8 @@
 import javax.swing.JToggleButton;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action;
+import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -67,11 +67,6 @@
         super(tr("Geotagged Images"), "geoimage", tr("Display geotagged images"), Shortcut.registerShortcut("tools:geotagged",
         tr("Tool: {0}", tr("Display geotagged images")), KeyEvent.VK_Y, Shortcut.DIRECT), 200);
 
-        /* Don't show a detached dialog right from the start. */
-        if (isShowing && !isDocked) {
-            setIsShowing(false);
-        }
-
         JPanel content = new JPanel();
         content.setLayout(new BorderLayout());
 
@@ -273,17 +268,6 @@
     }
 
     /**
-     * When pressing the Toggle button always show the docked dialog.
-     */
-    @Override
-    protected void toggleButtonHook() {
-        if (! isShowing) {
-            setIsDocked(true);
-            setIsCollapsed(false);
-        }
-    }
-
-    /**
      * When an image is closed, really close it and do not pop
      * up the side dialog.
      */