Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17303)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17305)
@@ -561,11 +561,9 @@
             });
         }
+        int index = -1;
         if (sel != null) {
-            int index = indexOfComponent(sel);
-            if (index > -1) {
-                setSelectedIndex(index);
-            }
-        }
-        setSelectedIndex(-1);
+            index = indexOfComponent(sel);
+        }
+        setSelectedIndex(index);
     }