diff --git a/modules/app/email/config.el b/modules/app/email/config.el
index 57d2877d1..2d7371412 100644
--- a/modules/app/email/config.el
+++ b/modules/app/email/config.el
@@ -149,10 +149,6 @@
   (when (featurep! :feature spellcheck)
     (add-hook 'mu4e-compose-mode-hook #'flyspell-mode))
 
-  ;; Brighter + no mode-line in message windows
-  (after! doom-themes
-    (add-hook 'mu4e-view-mode-hook #'doom-buffer-mode))
-
   ;; Wrap text in messages
   (add-hook! 'mu4e-view-mode-hook
     (setq-local truncate-lines nil))
diff --git a/modules/app/present/config.el b/modules/app/present/config.el
index fd5794a4e..98737a11d 100644
--- a/modules/app/present/config.el
+++ b/modules/app/present/config.el
@@ -71,8 +71,6 @@
     (add-hook! 'org-tree-slide-mode-hook
       (doom/window-zoom)
       (let ((arg (if org-tree-slide-mode +1 -1)))
-        (when (featurep 'doom-themes)
-          (doom-buffer-mode (* arg -1)))
         (centered-window-mode arg)
         (window-divider-mode (* arg -1))
         (doom-hide-modeline-mode arg)
diff --git a/modules/app/regex/autoload.el b/modules/app/regex/autoload.el
index 8b58505ea..3fc6a067e 100644
--- a/modules/app/regex/autoload.el
+++ b/modules/app/regex/autoload.el
@@ -60,7 +60,6 @@
         (doom-popup-buffer +regex--expr-buffer)
         (with-current-buffer +regex--expr-buffer
           (conf-mode)
-          (doom-buffer-mode +1)
           (rainbow-delimiters-mode +1)
           (linum-mode -1)
           (+regex-mode +1)
diff --git a/modules/app/twitter/config.el b/modules/app/twitter/config.el
index a7de167ba..f83a7ca72 100644
--- a/modules/app/twitter/config.el
+++ b/modules/app/twitter/config.el
@@ -18,9 +18,6 @@
 
   (set! :popup "*twittering-edit*" :size 12 :select t)
 
-  (after! doom-themes
-    (add-hook 'twittering-mode-hook #'doom-buffer-mode))
-
   (add-hook! twittering-mode
     (setq header-line-format (or (doom-modeline 'twitter) mode-line-format)
           mode-line-format nil))
diff --git a/modules/app/write/autoload.el b/modules/app/write/autoload.el
index b132bd881..81880a7a2 100644
--- a/modules/app/write/autoload.el
+++ b/modules/app/write/autoload.el
@@ -1,18 +1,11 @@
 ;;; app/write/autoload.el
 
-(defvar-local +write--buffer-mode nil
-  "TODO")
-
 ;;;###autoload
 (define-minor-mode +write-mode
   :init-value nil
   :keymap nil
   (let ((arg  (if +write-mode +1 -1))
         (iarg (if +write-mode -1 +1)))
-    (when (and (featurep 'doom-themes)
-               (not +write--buffer-mode)
-               +write-mode)
-      (setq +write--buffer-mode doom-buffer-mode))
     (text-scale-set (if +write-mode 2 0))
     (doom/toggle-line-numbers iarg)
     (setq-local visual-fill-column-center-text +write-mode)
diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index 4ef1ee072..779792826 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -301,4 +301,6 @@ re-align the table if necessary. (Necessary because org-mode has a
   (interactive)
   (let ((shackle-rules '(("^\\*Org Src" :align t :select t :regexp t :noesc t :same t))))
     (call-interactively 'org-edit-special)
-    (doom-buffer-mode +1)))
+    ;; FIXME too tightly coupled with doom-buffer-mode
+    (when (fboundp 'doom-buffer-mode)
+      (doom-buffer-mode +1))))
diff --git a/modules/tools/gist/config.el b/modules/tools/gist/config.el
index b463a3480..6e4e967a3 100644
--- a/modules/tools/gist/config.el
+++ b/modules/tools/gist/config.el
@@ -6,8 +6,6 @@
 
 (def-package! gist
   :commands (gist-list gist-region-or-buffer-private gist-region-or-buffer)
-  :init
-  (add-hook 'gist-mode-hook #'doom-buffer-mode)
   :config
   (set! :popup "*github:gists*" :size 15 :select t :autokill t)
 
diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index 93c30aca1..8033850e9 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -75,7 +75,15 @@
   (add-hook 'doom-popup-mode-hook #'+doom|buffer-mode-off)
 
   ;;
-  (add-hook '+workspaces-load-session-hook #'+doom|restore-bright-buffers))
+  (add-hook '+workspaces-load-session-hook #'+doom|restore-bright-buffers)
+
+  ;; Extra modes to activate doom-buffer-mode in
+  (add-hook! (gist-mode
+              twittering-mode
+              mu4e-view-mode
+              org-tree-slide-mode
+              +regex-mode)
+    #'doom-buffer-mode))
 
 
 ;; Flashes the line around the cursor after any motion command that might