Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 5969)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 5970)
@@ -478,6 +478,4 @@
             add(lblTitle_weak, GBC.std().fill(GBC.HORIZONTAL));
 
-            addMouseListener(new MouseEventHandler());
-
             if(Main.pref.getBoolean("dialog.dynamic.buttons", true)) {
                 buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHiddingType.ALWAYS_SHOWN ? "buttonhide" : "buttonshow"));
@@ -590,4 +588,8 @@
         }
         
+        public void registerMouseListener() {
+            addMouseListener(new MouseEventHandler());
+        }
+        
         class MouseEventHandler extends PopupMenuLauncher {
             public MouseEventHandler() {
@@ -860,4 +862,8 @@
             buttonsHide.setVisible(false);
         }
+        
+        // Register title bar mouse listener only after buttonActions has been initialized to have a complete popup menu
+        titleBar.registerMouseListener();
+        
         return data;
     }