Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 4612)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 4613)
@@ -306,11 +306,9 @@
             String res = actionParser.saveAction(aDef);
             
-            Collection<String> t = new LinkedList<String>(Main.pref.getCollection("toolbar"));
-            if (t!=null) {
-                // add custom search button to toolbar preferences
-                if (!t.contains(res)) t.add(res);
-                Main.pref.putCollection("toolbar", t);
-                Main.toolbar.refreshToolbarControl();
-            }
+            Collection<String> t = new LinkedList<String>(ToolbarPreferences.getToolString());
+            // add custom search button to toolbar preferences
+            if (!t.contains(res)) t.add(res);
+            Main.pref.putCollection("toolbar", t);
+            Main.toolbar.refreshToolbarControl();
         }
         return initialValues;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 4612)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 4613)
@@ -876,5 +876,5 @@
     "tagginggroup_Man Made/Man Made"};
 
-    private static Collection<String> getToolString() {
+    public static Collection<String> getToolString() {
 
         Collection<String> toolStr = Main.pref.getCollection("toolbar", Arrays.asList(deftoolbar));