Index: trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java	(revision 2524)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java	(revision 2525)
@@ -67,4 +67,5 @@
                 dlg.showDialog();
                 if (dlg.isDialogInCollapsedView()) {
+                    dlg.isCollapsed = false;    // pretend to be in Default view, this will be set back by collapse()
                     dlg.collapse();
                 }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 2524)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 2525)
@@ -66,5 +66,5 @@
      * currently minimized or not.
      */
-    private boolean isCollapsed;
+    boolean isCollapsed;
 
     /** the preferred height if the toggle dialog is expanded */
@@ -119,4 +119,5 @@
         isDocked = Main.pref.getBoolean(preferencePrefix+".docked", true);
         isCollapsed = Main.pref.getBoolean(preferencePrefix+".minimized", false);
+        //System.err.println(name+": showing="+isShowing+" docked="+isDocked+" collapsed="+isCollapsed);
     }
 
@@ -142,6 +143,10 @@
             } else {
                 showDialog();
-                expand();
-                dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
+                if (isDocked && isCollapsed) {
+                    expand();
+                }
+                if (isDocked) {
+                    dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
+                }
             }
         }
@@ -206,5 +211,5 @@
      */
     public void collapse() {
-        if (isShowing && isDocked && !isCollapsed) {
+//        if (isShowing && isDocked && !isCollapsed) {
             setContentVisible(false);
             setIsCollapsed(true);
@@ -214,5 +219,6 @@
             lblMinimized.setIcon(ImageProvider.get("misc", "minimized"));
             hideNotify();
-        }
+//        }
+//        else throw ...
     }
 
@@ -221,5 +227,5 @@
      */
     protected void expand() {
-        if (isShowing && isDocked && isCollapsed) {
+//        if (isShowing && isDocked && isCollapsed) {
             setContentVisible(true);
             setIsCollapsed(false);
@@ -228,5 +234,6 @@
             lblMinimized.setIcon(ImageProvider.get("misc", "normal"));
             showNotify();
-        }
+//        }
+//        else throw ...
     }
 
@@ -318,5 +325,5 @@
                         @Override
                         public void mouseClicked(MouseEvent e) {
-                            //                            toggleExpandedState();
+                            // toggleExpandedState();
                             if (isCollapsed) {
                                 expand();