diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index 63a5e8fa3..3099e5ab4 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -54,6 +54,11 @@ directives. By default, this only recognizes C directives.")
         ;; to do highlighting them all.
         evil-ex-interactive-search-highlight 'selected-window)
 
+  ;; Slow this down from 0.02 to prevent blocking in large or folded buffers
+  ;; like magit while incrementally highlighting matches.
+  (setq-hook! 'magit-mode-hook evil-ex-hl-update-delay 0.2)
+  (setq-hook! 'so-long-minor-mode-hook evil-ex-hl-update-delay 0.25)
+
   :config
   (evil-select-search-module 'evil-search-module 'evil-search)