Index: src/org/openstreetmap/josm/actions/HelpAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/HelpAction.java	(revision 1289)
+++ src/org/openstreetmap/josm/actions/HelpAction.java	(arbetskopia)
@@ -133,8 +133,8 @@
     private String contextSensitiveHelp(Object c) {
         if (c instanceof Helpful)
             return ((Helpful)c).helpTopic();
-        if (c instanceof JMenu)
-            return "Menu/"+((JMenu)c).getText();
+       /* if (c instanceof JMenu)
+            return "Menu/"+((JMenu)c).getText();*/
         if (c instanceof AbstractButton) {
             AbstractButton b = (AbstractButton)c;
             if (b.getClientProperty("help") != null)
Index: src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- src/org/openstreetmap/josm/gui/MainMenu.java	(revision 1289)
+++ src/org/openstreetmap/josm/gui/MainMenu.java	(arbetskopia)
@@ -163,6 +163,11 @@
     public void add(JMenu menu, int mnemonicKey, String shortName) {
         Shortcut.registerShortcut("menu:" + shortName, tr("Menu: {0}", menu.getText()), mnemonicKey,
                 Shortcut.GROUP_MNEMONIC).setMnemonic(menu);
+        
+        char initialChar = shortName.charAt(0);
+        String helpText = Character.toUpperCase(initialChar)+shortName.substring(1);
+
+        menu.putClientProperty("help", "Menu/"+helpText);
         add(menu);
     }