diff --git a/TODO.org b/TODO.org
index db7f85a79..20cc7f952 100644
--- a/TODO.org
+++ b/TODO.org
@@ -96,6 +96,7 @@
 + [ ] Update screenshots
 + [ ] tools/upload: add ~+upload/open-remote-file~ command to open current file on the remote (with TRAMP)
 + [ ] Fix ~0/0~ displaying in modeline (caused by leftover anzu state)
++ [X] Fix ~show-paren-mode~ overlays conflicting with org-indent (causes flickering)
 + [X] Fix ~M-z~, ~C-u~ and ~C-w~ in ~org-store-link~ & ~org-insert-link~ prompts
   Should undo, delete-line, and delete-word, respectively. Instead, they fall
   back to vanilla commands.
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index 3eed87ac2..8bf058620 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -58,11 +58,15 @@
 
   ;; highlight matching delimiters where it's important
   (defun +evil|show-paren-mode-off () (show-paren-mode -1))
-  (add-hook 'evil-insert-state-entry-hook   #'show-paren-mode)
+  (defun +evil|show-paren-mode-on ()
+    (unless (bound-and-true-p org-indent-mode) ; interferes with org-indent
+      (show-paren-mode +1)))
+
+  (add-hook 'evil-insert-state-entry-hook   #'+evil|show-paren-mode-on)
   (add-hook 'evil-insert-state-exit-hook    #'+evil|show-paren-mode-off)
-  (add-hook 'evil-visual-state-entry-hook   #'show-paren-mode)
+  (add-hook 'evil-visual-state-entry-hook   #'+evil|show-paren-mode-on)
   (add-hook 'evil-visual-state-exit-hook    #'+evil|show-paren-mode-off)
-  (add-hook 'evil-operator-state-entry-hook #'show-paren-mode)
+  (add-hook 'evil-operator-state-entry-hook #'+evil|show-paren-mode-on)
   (add-hook 'evil-operator-state-exit-hook  #'+evil|show-paren-mode-off)
   (add-hook 'evil-normal-state-entry-hook   #'+evil|show-paren-mode-off)