Index: applications/editors/josm/plugins/waypoints/src/WaypointOpenAction.java
===================================================================
--- applications/editors/josm/plugins/waypoints/src/WaypointOpenAction.java	(revision 9949)
+++ applications/editors/josm/plugins/waypoints/src/WaypointOpenAction.java	(revision 12575)
@@ -21,4 +21,5 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.actions.DiskAccessAction;
+import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
 
@@ -33,6 +34,7 @@
 	 */
 	public WaypointOpenAction() {
-		super(tr("Open waypoints file"), "open", tr("Open a waypoints file."), 
-						KeyEvent.VK_W, InputEvent.CTRL_DOWN_MASK);
+		super(tr("Open waypoints file"), "open", tr("Open a waypoints file."),
+		Shortcut.registerShortcut("tools:waypoints", tr("Menu: {0}",
+		tr("Open waypoints file")), KeyEvent.VK_W, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT));
 	}