Index: trunk/src/org/openstreetmap/josm/actions/HelpAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 9319)
+++ trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 9320)
@@ -7,6 +7,6 @@
 import java.awt.Point;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 
-import javax.swing.AbstractAction;
 import javax.swing.SwingUtilities;
 
@@ -15,5 +15,5 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.io.OnlineResource;
-import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -21,5 +21,5 @@
  * @since 155
  */
-public class HelpAction extends AbstractAction {
+public class HelpAction extends JosmAction {
 
     /**
@@ -27,8 +27,20 @@
      */
     public HelpAction() {
-        super(tr("Help"));
-        new ImageProvider("help").getResource().getImageIcon(this);
-        putValue("toolbar", "help");
+        this(true);
+    }
+
+    private HelpAction(boolean shortcut) {
+        super(tr("Help"), "help", null,
+                shortcut ? Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.DIRECT) : null,
+                true);
         setEnabled(!Main.isOffline(OnlineResource.JOSM_WEBSITE));
+    }
+
+    /**
+     * Constructs a new {@code HelpAction} without assigning a shortcut.
+     * @return a new {@code HelpAction}
+     */
+    public static HelpAction createWithoutShortcut() {
+        return new HelpAction(false);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 9319)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 9320)
@@ -818,11 +818,9 @@
         });
 
-        helpMenu.add(statusreport);
-        helpMenu.add(reportbug);
+        add(helpMenu, statusreport);
+        add(helpMenu, reportbug);
         helpMenu.addSeparator();
 
-        // FIXME why is help not a JosmAction?
-        helpMenu.add(help).setAccelerator(Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1,
-                Shortcut.DIRECT).getKeyStroke());
+        add(helpMenu, help);
         add(helpMenu, about);
         add(Box.createHorizontalGlue());
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 9319)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 9320)
@@ -192,5 +192,5 @@
             return Main.main.menu.help;
         }
-        return new HelpAction();
+        return HelpAction.createWithoutShortcut();
     }