Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 1991)
+++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 1992)
@@ -1,5 +1,3 @@
 package org.openstreetmap.josm.gui;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Component;
@@ -21,5 +19,4 @@
 import javax.swing.KeyStroke;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -44,5 +41,5 @@
      */
     public ExtendedDialog(Component parent, String title, Component content, String[] buttonTexts, String[] buttonIcons) {
-        super(JOptionPane.getFrameForComponent(parent), title, true);
+        super(JOptionPane.getFrameForComponent(parent), title, true /* modal */);
         this.parent = parent;
         bTexts = buttonTexts;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 1991)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 1992)
@@ -23,6 +23,8 @@
 import javax.swing.Box;
 import javax.swing.JButton;
+import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.ImageIcon;
@@ -162,5 +164,5 @@
         stickyActionListener = new ActionListener(){
             public void actionPerformed(ActionEvent e) {
-                final JFrame f = new JFrame(name);
+                final JDialog f = new JDialog(JOptionPane.getFrameForComponent(Main.parent),false /* not modal*/);
                 parent.remove(ToggleDialog.this);
                 f.getContentPane().add(ToggleDialog.this);