Index: src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 17198)
+++ src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(working copy)
@@ -469,7 +469,6 @@
     public PreferenceTabbedPane() {
         super(JTabbedPane.LEFT, JTabbedPane.SCROLL_TAB_LAYOUT);
         super.addMouseWheelListener(new WheelListener(this));
-        super.getModel().addChangeListener(this);
         ExpertToggleAction.addExpertModeChangeListener(this);
     }
 
@@ -487,6 +486,7 @@
             }
         }
         addGUITabs(false);
+        super.getModel().addChangeListener(this);
     }
 
     private void addGUITabsForSetting(Icon icon, TabPreferenceSetting tps) {