diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 97172e8b6..c8987a07a 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -77,24 +77,26 @@
 (after! slime (require 'slime-fuzzy))
 
 
-(after! macrostep
-  (map! :map macrostep-keymap
-        :n "RET"    #'macrostep-expand
-        :n "e"      #'macrostep-expand
-        :n "u"      #'macrostep-collapse
-        :n "c"      #'macrostep-collapse
+;; `macrostep'
+(map! :after macrostep
+      :map macrostep-keymap
+      :n "RET"    #'macrostep-expand
+      :n "e"      #'macrostep-expand
+      :n "u"      #'macrostep-collapse
+      :n "c"      #'macrostep-collapse
 
-        :n "TAB"    #'macrostep-next-macro
-        :n "n"      #'macrostep-next-macro
-        :n "J"      #'macrostep-next-macro
+      :n "TAB"    #'macrostep-next-macro
+      :n "n"      #'macrostep-next-macro
+      :n "J"      #'macrostep-next-macro
 
-        :n "S-TAB"  #'macrostep-prev-macro
-        :n "K"      #'macrostep-prev-macro
-        :n "p"      #'macrostep-prev-macro
+      :n "S-TAB"  #'macrostep-prev-macro
+      :n "K"      #'macrostep-prev-macro
+      :n "p"      #'macrostep-prev-macro
 
-        :n "q"      #'macrostep-collapse-all
-        :n "C"      #'macrostep-collapse-all)
+      :n "q"      #'macrostep-collapse-all
+      :n "C"      #'macrostep-collapse-all)
 
+(after! evil
   ;; `evil-normalize-keymaps' seems to be required for macrostep or it won't
   ;; apply for the very first invocation
   (add-hook 'macrostep-mode-hook #'evil-normalize-keymaps))