diff --git a/modules/editor/word-wrap/autoload.el b/modules/editor/word-wrap/autoload.el
index 40d67ea59..9befe8457 100644
--- a/modules/editor/word-wrap/autoload.el
+++ b/modules/editor/word-wrap/autoload.el
@@ -48,7 +48,11 @@ wrapped at `fill-column' by configuring `+word-wrap-fill-style'."
       (progn
         (setq-local
          +word-wrap--major-mode-is-visual
-         (memq major-mode +word-wrap-visual-modes)
+         (cl-loop for mode in +word-wrap-visual-modes
+                  if (or (eq major-mode mode)
+                         (and (boundp mode)
+                              (symbol-value mode)))
+                  return t)
          +word-wrap--major-mode-is-text
          (memq major-mode +word-wrap-text-modes)
          +word-wrap--enable-adaptive-wrap-mode
diff --git a/modules/editor/word-wrap/config.el b/modules/editor/word-wrap/config.el
index 337888d52..56bf2eb52 100644
--- a/modules/editor/word-wrap/config.el
+++ b/modules/editor/word-wrap/config.el
@@ -36,9 +36,8 @@ will not be affected."
   :type '(repeat symbol)
   :group '+word-wrap)
 
-(defcustom +word-wrap-visual-modes '(org-mode)
-  "Major-modes where `+word-wrap-mode' should not use
-`adaptive-wrap-prefix-mode'.")
+(defcustom +word-wrap-visual-modes '(org-indent-mode markdown-indent-mode)
+  "Major or minor modes where `adaptive-wrap-prefix-mode' show not be used."
   :type '(repeat symbol)
   :group '+word-wrap)