Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 1901)
+++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 1902)
@@ -21,4 +21,5 @@
 import javax.swing.KeyStroke;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -139,10 +140,16 @@
         setLocationRelativeTo(parent);
 
-        // try to put always on top
+        // temporary fix for "#3181 : Dialogs causes JOSM window to be set as "always on top", preventing switchiong to
+        // other windows."
+        // See also {@see OptionPaneUtil}
         //
-        try {
-            setAlwaysOnTop(true);
-        } catch(SecurityException e) {
-            System.out.println(tr("Warning: failed to bring extended dialog always on top. Exception: {0}", e.toString()));
+        if (Main.pref.getBoolean("window-handling.option-pane-always-on-top", true)) {
+            // try to put always on top
+            //
+            try {
+                setAlwaysOnTop(true);
+            } catch(SecurityException e) {
+                System.out.println(tr("Warning: failed to bring extended dialog always on top. Exception: {0}", e.toString()));
+            }
         }
     }