Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 12004)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 12005)
@@ -462,5 +462,5 @@
     }
 
-    private void insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int index) {
+    private int insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int index) {
         int position = index;
         for (PreferenceTab tab : tabs) {
@@ -469,4 +469,5 @@
             }
         }
+        return position - 1;
     }
 
@@ -595,6 +596,7 @@
                     Icon icon = getIconAt(index);
                     remove(index);
-                    insertGUITabsForSetting(icon, preferenceSettings, index);
-                    setSelectedIndex(index);
+                    if (index <= insertGUITabsForSetting(icon, preferenceSettings, index)) {
+                        setSelectedIndex(index);
+                    }
                 } catch (SecurityException ex) {
                     Main.error(ex);