diff --git a/src/org/openstreetmap/josm/gui/MainMenu.java b/src/org/openstreetmap/josm/gui/MainMenu.java
index 07ec8d1..348410a 100644
--- a/src/org/openstreetmap/josm/gui/MainMenu.java
+++ b/src/org/openstreetmap/josm/gui/MainMenu.java
@@ -843,10 +843,12 @@ public Dimension getPreferredSize() {
                         helpMenu.getPreferredSize().height);
             }
         };
+        Shortcut searchFieldShortcut = Shortcut.registerShortcut("menu:search-field", tr("Search menu items"), KeyEvent.VK_S, Shortcut.MNEMONIC);
+        searchFieldShortcut.setFocusAccelerator(searchField);
         searchField.setEditable(true);
         searchField.setMaximumSize(new Dimension(200, helpMenu.getPreferredSize().height));
         searchField.setHint(tr("Search menu items"));
-        searchField.setToolTipText(tr("Search menu items"));
+        searchField.setToolTipText(Main.platform.makeTooltip(tr("Search menu items"), searchFieldShortcut));
         searchField.addKeyListener(new SearchFieldKeyListener());
         searchField.getDocument().addDocumentListener(new SearchFieldTextListener(this, searchField));
         return searchField;
diff --git a/src/org/openstreetmap/josm/tools/Shortcut.java b/src/org/openstreetmap/josm/tools/Shortcut.java
index 2dab396..121ef61 100644
--- a/src/org/openstreetmap/josm/tools/Shortcut.java
+++ b/src/org/openstreetmap/josm/tools/Shortcut.java
@@ -16,6 +16,7 @@
 import javax.swing.AbstractButton;
 import javax.swing.JMenu;
 import javax.swing.KeyStroke;
+import javax.swing.text.JTextComponent;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -214,6 +215,14 @@ public void setMnemonic(AbstractButton button) {
         }
     }
     /**
+     * Sets the mnemonic key on a text component.
+     */
+    public void setFocusAccelerator(JTextComponent component) {
+        if (assignedModifier == getGroupModifier(MNEMONIC)  && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) {
+            component.setFocusAccelerator(KeyEvent.getKeyText(assignedKey).charAt(0));
+        }
+    }
+    /**
      * use this to set a actions's accelerator
      */
     public void setAccelerator(AbstractAction action) {