Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 4792)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 4793)
@@ -579,4 +579,7 @@
 
     protected void setIsDocked(boolean val) {
+        if(buttonsPanel != null) {
+            buttonsPanel.setVisible(val ? !isButtonHiding : true);
+        }
         isDocked = val;
         Main.pref.put(preferencePrefix+".docked", val);
@@ -689,5 +692,5 @@
             if(Main.pref.getBoolean("dialog.dynamic.buttons", true)) {
                 Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.MOUSE_MOTION_EVENT_MASK);
-                buttonsPanel.setVisible(!isButtonHiding);
+                buttonsPanel.setVisible(!isButtonHiding || !isDocked);
             }
         } else if(buttonsHide != null) {
@@ -699,5 +702,5 @@
     @Override
     public void eventDispatched(AWTEvent event) {
-        if(isShowing() && !isCollapsed && isButtonHiding) {
+        if(isShowing() && !isCollapsed && isDocked && isButtonHiding) {
             Rectangle b = this.getBounds();
             b.setLocation(getLocationOnScreen());