diff --git a/+org.el b/+org.el
index d0368ed..745d13e 100644
--- a/+org.el
+++ b/+org.el
@@ -38,6 +38,7 @@
       org-babel-default-lob-header-args '((:exports . "both")))
 ;; Enter writeroom-mode in all org files
 (add-hook 'org-mode-hook 'global-writeroom-mode)
+(setq writeroom-major-modes '(org-mode))
 ;; Respect LANGUAGE export variable
 (add-to-list 'org-latex-packages-alist '("AUTO" "babel" t ("pdflatex")))
 ;; Don't evaluate code blocks on export
diff --git a/config.el b/config.el
index f94bcc1..57f5e96 100644
--- a/config.el
+++ b/config.el
@@ -21,11 +21,10 @@
       auto-save-list-file-prefix (concat "~/.cache"))
 ;; Load org configuration
 (after! org (load! "+org"))
-;; Enter writeroom and disable completion and line numbers in Markdown
+;; Disable completion and line numbers in Markdown
 (add-hook 'markdown-mode-hook (lambda () (display-line-numbers-mode -1)))
 (after! markdown
-  (set-company-backend! 'markdown-mode nil)
-  (add-hook 'markdown-mode-hook 'global-writeroom-mode))
+  (set-company-backend! 'markdown-mode nil))
 ;; Reload file from disk without confirmation
 (defun revert-buffer-no-confirm ()
   (interactive)
@@ -43,8 +42,6 @@
                "0.5 sec" nil 'delete-windows-on
                (get-buffer-create "*compilation*"))
               (message "No Compilation Errors!")))))
-;; Enable writeroom for text modes
-(setq writeroom-major-modes '(markdown-mode org-mode))
 ;; Map leader key for major mode to ,
 (setq doom-localleader-key ",")
 ;; Show matching parenthesis on the minibuffer