diff --git a/modules/ui/treemacs/config.el b/modules/ui/treemacs/config.el
index a7cb4a3d0..53a4b50fc 100644
--- a/modules/ui/treemacs/config.el
+++ b/modules/ui/treemacs/config.el
@@ -51,7 +51,8 @@ This must be set before `treemacs' has loaded.")
 
 (use-package! treemacs-evil
   :when (featurep! :editor evil +everywhere)
-  :after treemacs
+  :defer t
+  :init (after! treemacs (require 'treemacs-evil))
   :config
   (define-key! evil-treemacs-state-map
     [return] #'treemacs-RET-action
@@ -60,12 +61,7 @@ This must be set before `treemacs' has loaded.")
     ;; REVIEW Fix #1875 to be consistent with C-w {v,s}, but this should really
     ;;        be considered upstream.
     "o v"    #'treemacs-visit-node-horizontal-split
-    "o s"    #'treemacs-visit-node-vertical-split
-    ;; REVIEW Fix #5056: treemacs-evil changed h/l to close/open folds, which is
-    ;;        substantially less useful than traversing up/down the tree,
-    ;;        especially when TAB already exists for toggle folds.
-    "h"      #'treemacs-root-up
-    "l"      #'treemacs-root-down))
+    "o s"    #'treemacs-visit-node-vertical-split))
 
 
 (use-package! treemacs-projectile