Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 6937)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 6938)
@@ -470,7 +470,8 @@
         private final JLabel lblTitle;
         private final JComponent lblTitle_weak;
-        private final DialogPopupMenu popupMenu = new DialogPopupMenu();
         /** the button which shows whether buttons are dynamic or not */
         private final JButton buttonsHide;
+        /** the contextual menu **/
+        private DialogPopupMenu popupMenu;
 
         public TitleBar(String toggleDialogName, String iconName) {
@@ -619,4 +620,5 @@
 
         public final void registerMouseListener() {
+            popupMenu = new DialogPopupMenu();
             addMouseListener(new MouseEventHandler());
         }
@@ -626,5 +628,6 @@
                 super(popupMenu);
             }
-            @Override public void mouseClicked(MouseEvent e) {
+            @Override
+            public void mouseClicked(MouseEvent e) {
                 if (SwingUtilities.isLeftMouseButton(e)) {
                     if (isCollapsed) {