Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 18731)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 18732)
@@ -73,4 +73,6 @@
 
     static {
+        // Load the history on initial load (for the drop-down dialog)
+        loadPrefs();
         SearchCompiler.addMatchFactory(new SimpleMatchFactory() {
             @Override
@@ -186,9 +188,17 @@
      */
     public static void search() {
-        prefs.load("search.history");
+        // Load the prefs, just in case someone fiddled with the preference value
+        loadPrefs();
         SearchSetting se = showSearchDialog(lastSearch);
         if (se != null) {
             searchWithHistory(se);
         }
+    }
+
+    /**
+     * Load preference values into the model
+     */
+    private static void loadPrefs() {
+        prefs.load("search.history");
     }