diff --git a/core/core-keybinds.el b/core/core-keybinds.el
index dee061219..b27523698 100644
--- a/core/core-keybinds.el
+++ b/core/core-keybinds.el
@@ -197,6 +197,10 @@ localleader prefix."
   (set-face-attribute 'which-key-local-map-description-face nil :weight 'bold)
   (which-key-setup-side-window-bottom)
   (setq-hook! 'which-key-init-buffer-hook line-spacing 3)
+
+  (which-key-add-key-based-replacements doom-leader-key "<leader>")
+  (which-key-add-key-based-replacements doom-localleader-key "<localleader>")
+
   (which-key-mode +1))
 
 
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 0808c9fc9..e73bb561c 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -242,9 +242,6 @@
   "P"    #'find-library)
 
 (after! which-key
-  (which-key-add-key-based-replacements doom-leader-key "<leader>")
-  (which-key-add-key-based-replacements doom-localleader-key "<localleader>")
-
   (which-key-add-key-based-replacements "C-h r" "reload")
   (when (featurep 'evil)
     (which-key-add-key-based-replacements (concat doom-leader-key     " r") "reload")