diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index e008dd3b0..7177fbb09 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -174,6 +174,16 @@ regex PATTERN. Returns the number of killed buffers."
       (kill-buffer buf))))
 
 
+;;
+;; Hooks
+;;
+
+;;;###autoload
+(defun doom|mark-buffer-as-real ()
+  "Hook function that marks the current buffer as real."
+  (doom-set-buffer-real (current-buffer) t))
+
+
 ;;
 ;; Interactive commands
 ;;
diff --git a/modules/emacs/eshell/config.el b/modules/emacs/eshell/config.el
index 90ed2816c..e8afe0b23 100644
--- a/modules/emacs/eshell/config.el
+++ b/modules/emacs/eshell/config.el
@@ -29,9 +29,7 @@
 
   :config
   ;; Consider eshell buffers real
-  (defun +eshell-p (buf)
-    (eq (buffer-local-value 'major-mode buf) 'eshell-mode))
-  (add-to-list 'doom-real-buffer-functions #'+eshell-p nil #'eq)
+  (add-hook 'eshell-mode-hook #'doom|mark-buffer-as-real)
 
   ;; Keep track of open eshell buffers
   (add-hook 'eshell-mode-hook #'+eshell|init)
diff --git a/modules/emacs/term/config.el b/modules/emacs/term/config.el
index 436a8d4f9..c65b42afb 100644
--- a/modules/emacs/term/config.el
+++ b/modules/emacs/term/config.el
@@ -9,6 +9,4 @@
   (set! :env "SHELL")
 
   ;; Consider term buffers real
-  (defun +term-p (buf)
-    (eq (buffer-local-value 'major-mode buf) 'term-mode))
-  (add-to-list 'doom-real-buffer-functions #'+term-p nil #'eq))
+  (add-hook 'term-mode-hook #'doom|mark-buffer-as-real))