diff --git a/include/draw_frame.h b/include/draw_frame.h
index 0c108b21c5..8c1d8cf42b 100644
--- a/include/draw_frame.h
+++ b/include/draw_frame.h
@@ -327,6 +327,12 @@ public:
     ///> @copydoc EDA_BASE_FRAME::WriteHotkeyConfig
     int WriteHotkeyConfig( struct EDA_HOTKEY_CONFIG* aDescList, wxString* aFullFileName = NULL );
 
+    /**
+     * Function GetHotkeyConfig()
+     * Returns a structure containing currently used hotkey mapping.
+     */
+    EDA_HOTKEY_CONFIG* GetHotkeyConfig() const { return m_hotkeysDescrList; }
+
     /**
      * Function GetHotKeyDescription
      * Searches lists of hot key identifiers (HK_xxx) used in the frame to find a matching
diff --git a/pcbnew/tools/common_actions.cpp b/pcbnew/tools/common_actions.cpp
index 19046980dd..7e33530ff0 100644
--- a/pcbnew/tools/common_actions.cpp
+++ b/pcbnew/tools/common_actions.cpp
@@ -446,7 +446,7 @@ TOOL_ACTION COMMON_ACTIONS::deleteItemCursor( "pcbnew.Control.deleteItemCursor",
         "", "" );
 
 TOOL_ACTION COMMON_ACTIONS::showHelp( "pcbnew.Control.showHelp",
-        AS_GLOBAL, '?',
+        AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_HELP ),
         "", "" );
 
 TOOL_ACTION COMMON_ACTIONS::toBeDone( "pcbnew.Control.toBeDone",
diff --git a/pcbnew/tools/pcbnew_control.cpp b/pcbnew/tools/pcbnew_control.cpp
index 4fff0cb9d8..edc597f20d 100644
--- a/pcbnew/tools/pcbnew_control.cpp
+++ b/pcbnew/tools/pcbnew_control.cpp
@@ -36,8 +36,9 @@
 #include <class_draw_panel_gal.h>
 #include <class_pcb_screen.h>
 #include <confirm.h>
-#include <tool/tool_manager.h>
+#include <hotkeys_basic.h>
 
+#include <tool/tool_manager.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <view/view_controls.h>
 #include <pcb_painter.h>
@@ -559,8 +560,7 @@ int PCBNEW_CONTROL::DeleteItemCursor( const TOOL_EVENT& aEvent )
 
 int PCBNEW_CONTROL::ShowHelp( const TOOL_EVENT& aEvent )
 {
-    // TODO
-    DisplayInfoMessage( m_frame, _( "Not implemented yet." ) );
+    DisplayHotkeyList( m_frame, m_frame->GetHotkeyConfig() );
 
     return 0;
 }