Index: src/org/openstreetmap/josm/actions/AboutAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/AboutAction.java	(revision 16500)
+++ src/org/openstreetmap/josm/actions/AboutAction.java	(working copy)
@@ -63,7 +63,7 @@
     public AboutAction() {
         super(tr("About"), "logo", tr("Display the about screen."),
             Shortcut.registerShortcut("system:about", tr("About"),
-            KeyEvent.VK_F1, Shortcut.SHIFT), true);
+            KeyEvent.VK_F1, Shortcut.SHIFT), true, false);
     }
 
     JPanel buildAboutPanel() {
Index: src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java	(revision 16500)
+++ src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java	(working copy)
@@ -33,7 +33,7 @@
      */
     public DownloadPrimitiveAction() {
         super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID"),
-                SHORTCUT, true);
+                SHORTCUT, true, false);
         setHelpId(ht("/Action/DownloadObject"));
     }
 
Index: src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 16500)
+++ src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(working copy)
@@ -33,10 +33,8 @@
         super(tr("History"), "dialogs/history",
                 tr("Display history information about OSM ways, nodes, or relations."),
                 Shortcut.registerShortcut("core:historyinfo",
-                        tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
+                        tr("History"), KeyEvent.VK_H, Shortcut.CTRL), true, "action/historyinfo", false);
         setHelpId(ht("/Action/ObjectHistory"));
-        setToolbarId("action/historyinfo");
-        MainApplication.getToolbar().register(this);
         setEnabled(true);
     }
 
Index: src/org/openstreetmap/josm/actions/NewAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/NewAction.java	(revision 16500)
+++ src/org/openstreetmap/josm/actions/NewAction.java	(working copy)
@@ -22,7 +22,7 @@
      */
     public NewAction() {
         super(tr("New Layer"), "new", tr("Create a new map layer."),
-                Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New Layer")), KeyEvent.VK_N, Shortcut.CTRL), true);
+                Shortcut.registerShortcut("system:new", tr("File: {0}", tr("New Layer")), KeyEvent.VK_N, Shortcut.CTRL), true, false);
         setHelpId(ht("/Action/NewLayer"));
     }
 
Index: src/org/openstreetmap/josm/actions/OpenFileAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/OpenFileAction.java	(revision 16500)
+++ src/org/openstreetmap/josm/actions/OpenFileAction.java	(working copy)
@@ -66,7 +66,8 @@
      */
     public OpenFileAction() {
         super(tr("Open..."), "open", tr("Open a file."),
-                Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.CTRL));
+                Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.CTRL),
+                true, null, false);
         setHelpId(ht("/Action/Open"));
     }
 
Index: src/org/openstreetmap/josm/actions/OpenLocationAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/OpenLocationAction.java	(revision 16500)
+++ src/org/openstreetmap/josm/actions/OpenLocationAction.java	(working copy)
@@ -86,7 +86,7 @@
         /* I18N: Command to download a specific location/URL */
         super(tr("Open Location..."), "openlocation", tr("Open an URL."),
                 Shortcut.registerShortcut("system:open_location", tr("File: {0}", tr("Open Location...")),
-                        KeyEvent.VK_L, Shortcut.CTRL), true);
+                        KeyEvent.VK_L, Shortcut.CTRL), true, false);
         setHelpId(ht("/Action/OpenLocation"));
         this.downloadTasks = new ArrayList<>();
         addDownloadTaskClass(DownloadOsmTask.class);
Index: src/org/openstreetmap/josm/actions/PreferencesAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 16500)
+++ src/org/openstreetmap/josm/actions/PreferencesAction.java	(working copy)
@@ -87,7 +87,7 @@
      */
     public PreferencesAction() {
         super(tr("Preferences..."), "preference", tr("Open a preferences dialog for global settings."),
-                Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true);
+                Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true, false);
         setHelpId(ht("/Action/Preferences"));
         this.tab = null;
         this.subTab = null;