Index: src/org/openstreetmap/josm/actions/PreferencesAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 17264)
+++ src/org/openstreetmap/josm/actions/PreferencesAction.java	(working copy)
@@ -7,8 +7,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
-import javax.swing.SwingUtilities;
-
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
@@ -107,15 +105,13 @@
     @Override
     public void run() {
         final PreferenceDialog p = new PreferenceDialog(MainApplication.getMainFrame());
-        SwingUtilities.invokeLater(() -> {
-            if (tab != null) {
-                p.selectPreferencesTabByClass(tab);
-            } else if (subTab != null) {
-                p.selectSubPreferencesTabByClass(subTab);
-            } else {
-                p.selectPreviouslySelectedPreferences();
-            }
-        });
+        if (tab != null) {
+            p.selectPreferencesTabByClass(tab);
+        } else if (subTab != null) {
+            p.selectSubPreferencesTabByClass(subTab);
+        } else {
+            p.selectPreviouslySelectedPreferences();
+        }
         p.setVisible(true);
     }
 }
Index: src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(revision 17264)
+++ src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java	(working copy)
@@ -153,6 +153,8 @@
             tpPreferences.selectSubTabByPref(previouslySelected.b);
         } else if (previouslySelected != null && previouslySelected.a != null) {
             tpPreferences.selectTabByPref(previouslySelected.a);
+        } else {
+            tpPreferences.setSelectedIndex(0);
         }
     }
 
Index: src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17264)
+++ src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(working copy)
@@ -558,6 +558,7 @@
                 setSelectedIndex(index);
             }
         }
+        setSelectedIndex(-1);
     }
 
     @Override