Index: src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 18719)
+++ src/org/openstreetmap/josm/actions/search/SearchAction.java	(working copy)
@@ -182,10 +182,17 @@
     }
 
     /**
+     * Initializes search history elements to {@link AutoCompComboBoxModel}.
+     */
+    public static void initHistory() {
+        prefs.load("search.history");
+    }
+
+    /**
      * Launches the dialog for specifying search criteria and runs a search
      */
     public static void search() {
-        prefs.load("search.history");
+        initHistory();
         SearchSetting se = showSearchDialog(lastSearch);
         if (se != null) {
             searchWithHistory(se);
Index: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 18719)
+++ src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(working copy)
@@ -755,7 +755,7 @@
     protected static class SearchPopupMenu extends JPopupMenu {
         public static void launch(Component parent) {
             if (org.openstreetmap.josm.actions.search.SearchAction.getSearchHistory().isEmpty())
-                return;
+                org.openstreetmap.josm.actions.search.SearchAction.initHistory();
             if (parent.isShowing()) {
                 JPopupMenu menu = new SearchPopupMenu();
                 Rectangle r = parent.getBounds();