Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 12345)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 12346)
@@ -42,4 +42,5 @@
 import org.openstreetmap.josm.actions.ActionParameter;
 import org.openstreetmap.josm.actions.ActionParameter.SearchSettingsActionParameter;
+import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.ParameterizedAction;
@@ -299,5 +300,8 @@
         additionalSettings.add(caseSensitive, GBC.eol().anchor(GBC.WEST).fill(GBC.HORIZONTAL));
 
-        if (Main.pref.getBoolean("expert", false)) {
+        left.add(selectionSettings, GBC.eol().fill(GBC.BOTH));
+        left.add(additionalSettings, GBC.eol().fill(GBC.BOTH));
+
+        if (ExpertToggleAction.isExpert()) {
             additionalSettings.add(allElements, GBC.eol());
             additionalSettings.add(addOnToolbar, GBC.eop());
@@ -309,10 +313,5 @@
             searchOptions.add(mapCSSSearch, GBC.eol());
 
-            left.add(selectionSettings, GBC.eol().fill(GBC.BOTH));
-            left.add(additionalSettings, GBC.eol().fill(GBC.BOTH));
             left.add(searchOptions, GBC.eol().fill(GBC.BOTH));
-        } else {
-            left.add(selectionSettings, GBC.eol().fill(GBC.BOTH));
-            left.add(additionalSettings, GBC.eol().fill(GBC.BOTH));
         }
 
@@ -450,5 +449,5 @@
                 GBC.eol());
 
-        if (Main.pref.getBoolean("expert", false)) {
+        if (ExpertToggleAction.isExpert()) {
             hintPanel.add(new SearchKeywordRow(hcbSearchString)
                 .addTitle(tr("objects"))