Index: /trunk/src/org/openstreetmap/josm/actions/InvertSelectionAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/InvertSelectionAction.java	(revision 17061)
+++ /trunk/src/org/openstreetmap/josm/actions/InvertSelectionAction.java	(revision 17062)
@@ -6,6 +6,8 @@
 
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 
 import org.openstreetmap.josm.data.osm.OsmData;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -18,6 +20,8 @@
      */
     public InvertSelectionAction() {
-        super(tr("Invert Selection"), "invert_selection", tr("Invert Selection"), null, true);
-        setHelpId(ht("/Action/InvertSelection"));
+        super(tr("Invert Selection"), "invert_selection", tr("Invert Selection"),
+                Shortcut.registerShortcut("selection:invertselection",
+                tr("Selection: {0}", tr("Invert Selection")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true);
+                setHelpId(ht("/Action/InvertSelection"));
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java	(revision 17061)
+++ /trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java	(revision 17062)
@@ -7,4 +7,5 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.util.Collections;
 import java.util.Optional;
@@ -24,4 +25,5 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -35,5 +37,7 @@
     /** Constructs a new note search action */
     public SearchNotesDownloadAction() {
-        super(tr("Search Notes..."), "note_search", tr("Download notes from the note search API"), null, false, false);
+        super(tr("Search Notes..."), "note_search", tr("Download notes from the note search API"),
+                Shortcut.registerShortcut("file:notesearch",
+                tr("File: {0}", tr("Search Notes...")), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, false);
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java	(revision 17061)
+++ /trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java	(revision 17062)
@@ -21,5 +21,5 @@
     public SelectAllAction() {
         super(tr("Select All"), "selectall", tr("Select all undeleted objects in the data layer. This selects incomplete objects too."),
-                Shortcut.registerShortcut("system:selectall", tr("Edit: {0}", tr("Select All")), KeyEvent.VK_A, Shortcut.CTRL), true);
+                Shortcut.registerShortcut("system:selectall", tr("Selection: {0}", tr("Select All")), KeyEvent.VK_A, Shortcut.CTRL), true);
         setHelpId(ht("/Action/SelectAll"));
     }
Index: /trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequencesAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequencesAction.java	(revision 17061)
+++ /trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequencesAction.java	(revision 17062)
@@ -24,5 +24,6 @@
                 "way-select",
                 tr("Select non-branching sequences of ways"),
-                Shortcut.registerShortcut("wayselector:wayselect", tr("Non-branching way sequences"), KeyEvent.VK_W, Shortcut.SHIFT),
+                Shortcut.registerShortcut("wayselector:wayselect", tr("Selection: {0}", tr("Non-branching way sequences")),
+                    KeyEvent.VK_W, Shortcut.SHIFT),
                 true);
     }
Index: /trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java	(revision 17061)
+++ /trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java	(revision 17062)
@@ -20,5 +20,5 @@
     public UnselectAllAction() {
         super(tr("Unselect All"), "unselectall", tr("Unselect all objects."),
-            Shortcut.registerShortcut("edit:unselectall", tr("Edit: {0}",
+            Shortcut.registerShortcut("edit:unselectall", tr("Selection: {0}",
             tr("Unselect All")), KeyEvent.VK_ESCAPE, Shortcut.DIRECT), true);
 
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 17061)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 17062)
@@ -12,4 +12,5 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.KeyEvent;
 import java.util.Arrays;
 import java.util.Collection;
@@ -63,4 +64,5 @@
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -251,5 +253,6 @@
                 "changesetdialog",
                 tr("Open the list of changesets in the current layer."),
-                null, /* no keyboard shortcut */
+                Shortcut.registerShortcut("subwindow:changesets", tr("Toggle: {0}", tr("Changesets")),
+                    KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
                 200, /* the preferred height */
                 false, /* don't show if there is no preference */
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java	(revision 17061)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java	(revision 17062)
@@ -4,4 +4,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -14,4 +15,5 @@
 import org.openstreetmap.josm.gui.bbox.BBoxChooser;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -27,5 +29,7 @@
      */
     public MinimapDialog() {
-        super(tr("Mini map"), "minimap", tr("Displays a small map of the current edit location"), null, 150);
+        super(tr("Mini map"), "minimap", tr("Displays a small map of the current edit location"),
+                Shortcut.registerShortcut("subwindow:minimap", tr("Toggle: {0}", tr("Mini map")),
+                KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 150);
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 17061)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 17062)
@@ -9,4 +9,5 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.KeyEvent;
 import java.text.DateFormat;
 import java.util.ArrayList;
@@ -51,4 +52,5 @@
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.date.DateUtils;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -74,5 +76,7 @@
     /** Creates a new toggle dialog for notes */
     public NotesDialog() {
-        super(tr("Notes"), "notes/note_open", tr("List of notes"), null, 150);
+        super(tr("Notes"), "notes/note_open", tr("List of notes"),
+                Shortcut.registerShortcut("subwindow:notes", tr("Toggle: {0}", tr("Notes")),
+                KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), 150);
         addCommentAction = new AddCommentAction();
         closeAction = new CloseAction();