diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index 81b36204a1..ec1e08c21b 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -529,6 +529,10 @@ void EDA_BASE_FRAME::OnPreferences( wxCommandEvent& event )
             frame->InstallPreferences( &dlg, hotkeysPanel );
     }
 
+    // The Kicad manager frame is not a player so we have to add it by hand
+    if( IsType( KICAD_MAIN_FRAME_T ) )
+        InstallPreferences( &dlg, hotkeysPanel );
+
     if( dlg.ShowModal() == wxID_OK )
         dlg.Kiway().CommonSettingsChanged();
 }
diff --git a/kicad/kicad_manager_frame.cpp b/kicad/kicad_manager_frame.cpp
index 89b96a604c..074d1b5378 100644
--- a/kicad/kicad_manager_frame.cpp
+++ b/kicad/kicad_manager_frame.cpp
@@ -31,6 +31,7 @@
 #include <executable_names.h>
 #include <build_version.h>
 #include "pgm_kicad.h"
+#include <panel_hotkeys_editor.h>
 #include "tree_project_frame.h"
 #include "kicad_id.h"
 #include <tool/tool_manager.h>
@@ -480,6 +481,16 @@ void KICAD_MANAGER_FRAME::SaveSettings( wxConfigBase* aCfg )
 }
 
 
+void KICAD_MANAGER_FRAME::InstallPreferences( PAGED_DIALOG* aParent,
+                                              PANEL_HOTKEYS_EDITOR* aHotkeysPanel  )
+{
+    aHotkeysPanel->AddHotKeys( GetToolManager() );
+}
+
+
+
+
+
 void KICAD_MANAGER_FRAME::PrintPrjInfo()
 {
     wxString msg = wxString::Format( _( "Project name:\n%s\n" ),
diff --git a/kicad/kicad_manager_frame.h b/kicad/kicad_manager_frame.h
index 005d2f1a53..a2f482e730 100644
--- a/kicad/kicad_manager_frame.h
+++ b/kicad/kicad_manager_frame.h
@@ -149,6 +149,8 @@ public:
 
     void SyncToolbars() override;
 
+    void InstallPreferences( PAGED_DIALOG* aParent, PANEL_HOTKEYS_EDITOR* aHotkeysPanel ) override;
+
     void SetProjectFileName( const wxString& aFullProjectProFileName );
     const wxString GetProjectFileName();