diff --git a/core/core-editor.el b/core/core-editor.el
index faf33c123..3d7db0688 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -97,6 +97,9 @@ possible."
       require-final-newline t
       tabify-regexp "^\t* [ \t]+")  ; for :retab
 
+;; Favor hard-wrapping in text modes
+(add-hook 'text-mode-hook #'auto-fill-mode)
+
 
 ;;
 ;;; Clipboard / kill-ring
diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index e82a4c3dd..1dadcecf7 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -38,9 +38,6 @@ capture, the end position, and the output buffer.")
   (set-lookup-handlers! '(markdown-mode gfm-mode)
     :file #'markdown-follow-thing-at-point)
 
-  ;; Enable hard-wrapping. By convention, Doom does this for all textual modes.
-  (add-hook 'markdown-mode-hook #'auto-fill-mode)
-
   ;; Prevent mis-fontification of YAML metadata blocks in `markdown-mode' which
   ;; occurs when the first line contains a colon in it. See
   ;; https://github.com/jrblevin/markdown-mode/issues/328.
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index ee275f009..df3c93315 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -845,7 +845,6 @@ compelling reason, so..."
   (add-hook! 'org-mode-hook
              #'org-bullets-mode  ; "prettier" bullets
              #'toc-org-enable    ; auto-table of contents
-             #'auto-fill-mode    ; hard line wrapping
              ;; `show-paren-mode' causes flickering with indentation margins made by
              ;; `org-indent-mode', so we turn off show-paren-mode altogether
              #'doom-disable-show-paren-mode-h