diff --git a/lisp/init-evil.el b/lisp/init-evil.el
index ad7b6e3..fcfd448 100644
--- a/lisp/init-evil.el
+++ b/lisp/init-evil.el
@@ -93,13 +93,12 @@ if LOCALLEADER is nil, otherwise \"<localleader>\"."
             ;; Save which-key (key . replacement).
             (pcase def
               (`(:wk ,replacement)
-               (push (cons (concat prefix key) replacement) wk-replacements)))))
+               (push (cons (concat "SPC " key) replacement) wk-replacements)))))
         ;; which-key integration.
         ;; XXX: replacement for localleader NOT supported.
-        (with-eval-after-load 'which-key
-          (cl-loop for (key . replacement) in wk-replacements
-                   unless localleader
-                   do (which-key-add-key-based-replacements key replacement)))))
+        (cl-loop for (key . replacement) in wk-replacements
+                 unless localleader
+                 do (which-key-add-key-based-replacements key replacement))))
 
     (define-leader-key 'normal 'global nil
       ;; SPC, quit minibuffer.