diff --git a/gerbview/hotkeys.cpp b/gerbview/hotkeys.cpp
index 0d64bff193..a0bf3ddff0 100644
--- a/gerbview/hotkeys.cpp
+++ b/gerbview/hotkeys.cpp
@@ -65,7 +65,7 @@ static EDA_HOTKEY   HkZoomOut( _HKI( "Zoom Out" ), HK_ZOOM_OUT, WXK_F2 );
 static EDA_HOTKEY   HkZoomIn( _HKI( "Zoom In" ), HK_ZOOM_IN, WXK_F1 );
 static EDA_HOTKEY   HkZoomSelection( _HKI( "Zoom to Selection" ),
                                      HK_ZOOM_SELECTION, GR_KB_CTRL + WXK_F5 );
-static EDA_HOTKEY   HkHelp( _HKI( "Help (this window)" ), HK_HELP, '?' );
+static EDA_HOTKEY   HkHelp( _HKI( "Help (this window)" ), HK_HELP, GR_KB_CTRL + WXK_F1 );
 static EDA_HOTKEY   HkSwitchUnits( _HKI( "Switch Units" ), HK_SWITCH_UNITS, 'U' );
 static EDA_HOTKEY   HkResetLocalCoord( _HKI( "Reset Local Coordinates" ),
                                        HK_RESET_LOCAL_COORD, ' ' );
@@ -111,8 +111,8 @@ static EDA_HOTKEY HkMeasureTool( _HKI( "Measure Distance (Modern Toolset only)"
 // List of common hotkey descriptors
 EDA_HOTKEY* gerbviewHotkeyList[] = {
     &HkHelp,
-    &HkZoomIn,                      &HkZoomOut,         &HkZoomRedraw,  &HkZoomCenter,
-    &HkZoomAuto,    &HkZoomSelection, &HkSwitchUnits, &HkResetLocalCoord,
+    &HkZoomIn, &HkZoomOut, &HkZoomRedraw, &HkZoomCenter,
+    &HkZoomAuto, &HkZoomSelection, &HkSwitchUnits, &HkResetLocalCoord,
     &HkLinesDisplayMode, &HkFlashedDisplayMode, &HkPolygonDisplayMode,
     &HkDCodesDisplayMode, &HkNegativeObjDisplayMode,
     &HkSwitch2NextCopperLayer,
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index da7e9b8554..fb6c3fb696 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -365,8 +365,9 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
                  _( "Open the GerbView Manual" ),
                  KiBitmap( online_help_xpm ) );
 
+    text = AddHotkeyName( _( "&List Hotkeys..." ), GerbviewHokeysDescr, HK_HELP );
     AddMenuItem( helpMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST,
-                 _( "&List Hotkeys..." ),
+                 text,
                  _( "Displays the current hotkeys list and corresponding commands" ),
                  KiBitmap( hotkeys_xpm ) );
 
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index 8283bb4bf0..7411452b84 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -158,7 +158,7 @@ static EDA_HOTKEY HkRunPleditor( _HKI( "Run PlEditor" ), HK_RUN_PLEDITOR, 'Y' +
 static EDA_HOTKEY HkNewProject( _HKI( "New Project" ), HK_NEW, GR_KB_CTRL + 'N' );
 static EDA_HOTKEY HkOpenProject( _HKI( "Open Project" ), HK_OPEN, GR_KB_CTRL + 'O' );
 static EDA_HOTKEY HkSaveProject( _HKI( "Save Project" ), HK_SAVE, GR_KB_CTRL + 'S' );
-static EDA_HOTKEY HkHelp( _HKI( "Help (this window)" ), HK_HELP, '?' );
+static EDA_HOTKEY HkHelp( _HKI( "Help (this window)" ), HK_HELP, GR_KB_CTRL + WXK_F1 );
 
 // List of hotkey descriptors
 EDA_HOTKEY* common_Hotkey_List[] =