Index: src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 2466)
+++ src/org/openstreetmap/josm/actions/search/SearchAction.java	(working copy)
@@ -1,6 +1,7 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.actions.search;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Font;
@@ -46,6 +47,7 @@
     public SearchAction() {
         super(tr("Search..."), "dialogs/search", tr("Search for objects."),
                 Shortcut.registerShortcut("system:find", tr("Search..."), KeyEvent.VK_F, Shortcut.GROUP_HOTKEY), true);
+        putValue("help", ht("/Action/Search"));
     }
 
     public void actionPerformed(ActionEvent e) {
@@ -149,6 +151,7 @@
                             tr("Cancel")}
         );
         dialog.setButtonIcons(new String[] {"dialogs/search.png", "cancel.png"});
+        dialog.configureContextsensitiveHelp("/Action/Search", true /* show help button */);
         dialog.setContent(p);
         dialog.showDialog();
         int result = dialog.getValue();