1 files changed, 10 insertions, 0 deletions

diff --git a/apps/main.c b/apps/main.c
index a88cd73ef7..2f3b246210 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -31,6 +31,7 @@
 #include "led.h"
 #include "../kernel-internal.h"
 #include "button.h"
+#include "core_keymap.h"
 #include "tree.h"
 #include "filetypes.h"
 #include "panic.h"
@@ -175,6 +176,15 @@ int main(void)
     usb_start_monitoring();
 #endif
 
+#if !defined(DISABLE_ACTION_REMAP) && defined(CORE_KEYREMAP_FILE)
+    if (file_exists(CORE_KEYREMAP_FILE))
+    {
+        int mapct = core_load_key_remap(CORE_KEYREMAP_FILE);
+        if (mapct <= 0)
+            splashf(HZ, "key remap failed: %d,  %s", mapct, CORE_KEYREMAP_FILE);
+    }
+#endif
+
 #ifdef AUTOROCK
     {
         char filename[MAX_PATH];