Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 6585)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 6586)
@@ -320,5 +320,6 @@
             ToolbarPreferences.ActionDefinition aDef =
                     new ToolbarPreferences.ActionDefinition(Main.main.menu.search);
-            aDef.getParameters().put("searchExpression", initialValues);
+            aDef.getParameters().put(SEARCH_EXPRESSION, initialValues);
+            aDef.setName(initialValues.text); // Display search expression as tooltip instead of generic one
             // parametrized action definition is now composed
             ActionParser actionParser = new ToolbarPreferences.ActionParser(null);