diff --git a/modules/feature/evil/autoload/folds.el b/modules/feature/evil/autoload/folds.el
index e913ca1b6..ac61e8e94 100644
--- a/modules/feature/evil/autoload/folds.el
+++ b/modules/feature/evil/autoload/folds.el
@@ -1,5 +1,8 @@
 ;;; feature/evil/autoload/folds.el -*- lexical-binding: t; -*-
 
+(require 'evil-vimish-fold)
+(require 'hideshow)
+
 ;; `hideshow' is a decent code folding implementation, but it won't let you
 ;; create custom folds. `evil-vimish-fold' offers custom folds, but essentially
 ;; ignores any other type of folding (indent or custom markers, which
@@ -15,7 +18,6 @@
   (unless (bound-and-true-p hs-minor-mode)
     (hs-minor-mode +1)))
 
-(require 'hideshow)
 (advice-add #'hs-toggle-hiding :before #'+evil--ensure-modes)
 (advice-add #'hs-hide-block    :before #'+evil--ensure-modes)
 (advice-add #'hs-hide-level    :before #'+evil--ensure-modes)
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index efeca9c58..c8f5ba68e 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -336,11 +336,14 @@ the new algorithm is confusing, like in python or ruby."
 
 
 (def-package! evil-vimish-fold
-  :commands evil-vimish-fold-mode
+  :commands (evil-vimish-fold/next-fold evil-vimish-fold/previous-fold
+             evil-vimish-fold/delete evil-vimish-fold/delete-all
+             evil-vimish-fold/create evil-vimish-fold/create-line)
   :init
   (setq vimish-fold-dir (concat doom-cache-dir "vimish-fold/")
         vimish-fold-indication-mode 'right-fringe)
-  (add-hook 'doom-post-init-hook #'evil-vimish-fold-mode t))
+  :config
+  (vimish-fold-global-mode +1))
 
 
 ;; Without `evil-visualstar', * and # grab the word at point and search, no