diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index d0f6b7f2f..62f44a7d9 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -139,6 +139,8 @@ If BUFFER-OR-NAME is omitted or nil, the current buffer is tested."
       (stringp buffer-or-name)
       (signal 'wrong-type-argument (list '(bufferp stringp) buffer-or-name)))
   (when-let (buf (get-buffer buffer-or-name))
+    (when-let (basebuf (buffer-base-buffer buf))
+      (setq buf basebuf))
     (and (buffer-live-p buf)
          (not (doom-temp-buffer-p buf))
          (or (buffer-local-value 'doom-real-buffer-p buf)
diff --git a/modules/tools/ein/config.el b/modules/tools/ein/config.el
index cc6d21c04..3bc10cd1e 100644
--- a/modules/tools/ein/config.el
+++ b/modules/tools/ein/config.el
@@ -1,11 +1,11 @@
 ;;; tools/ein/config.el -*- lexical-binding: t; -*-
 
 ;;
-;; Packages
+;;; Packages
 
 (after! ein
   (defun +ein-buffer-p (buf)
-    (or (memq (or (buffer-base-buffer buf) (current-buffer)) (ein:notebook-opened-buffers))
+    (or (memq buf (ein:notebook-opened-buffers))
         (memq buf (mapcar #'ein:notebooklist-get-buffer (ein:notebooklist-keys)))))
   (add-to-list 'doom-real-buffer-functions #'+ein-buffer-p nil #'eq)
   (map! :map ein:notebook-mode-map