Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 6169)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 6170)
@@ -73,5 +73,5 @@
  *
  */
-public class ToggleDialog extends JPanel implements ShowHideButtonListener, Helpful, AWTEventListener {
+public class ToggleDialog extends JPanel implements ShowHideButtonListener, Helpful, AWTEventListener, Destroyable {
 
     public enum ButtonHiddingType {
@@ -398,4 +398,5 @@
     }
 
+    @Override
     public void destroy() {
         closeDetachedDialog();
@@ -403,14 +404,14 @@
         Main.main.menu.windowMenu.remove(windowMenuItem);
         Toolkit.getDefaultToolkit().removeAWTEventListener(this);
-        destroyComponents(this);
-    }
-
-    private void destroyComponents(Component component) {
+        destroyComponents(this, false);
+    }
+
+    private void destroyComponents(Component component, boolean destroyItself) {
         if (component instanceof Container) {
             for (Component c: ((Container)component).getComponents()) {
-                destroyComponents(c);
-            }
-        }
-        if (component instanceof Destroyable) {
+                destroyComponents(c, true);
+            }
+        }
+        if (destroyItself && component instanceof Destroyable) {
             ((Destroyable) component).destroy();
         }