diff --git a/core/core-popups.el b/core/core-popups.el
index 13588f54a..454981d71 100644
--- a/core/core-popups.el
+++ b/core/core-popups.el
@@ -68,20 +68,21 @@ is enabled/disabled.'")
           ("^\\*doom:" :regexp t :size 0.35 :noesc t :select t :modeline t)
           ("^\\*doom " :regexp t :noselect t :autokill t :autoclose t)
           ;; built-in (emacs)
-          ("*Backtrace*" :size 20 :noselect t)
-          ("*Warnings*" :size 5 :noselect t :autokill t :autoclose t)
-          ("*Messages*" :size 12 :noselect t :autokill nil)
-          ("*Help*" :size 0.3)
-          ("^\\*.*Shell Command.*\\*$" :regexp t :size 20 :noselect t :autokill t)
-          ("^\\*"  :regexp t :noselect t :autokill t)
-          ("^ \\*" :regexp t :size 12 :noselect t :autokill t :autoclose t)
           (apropos-mode :size 0.3 :autokill t :autoclose t)
           (Buffer-menu-mode :size 20 :autokill t)
           (comint-mode :noesc t)
           (grep-mode :size 25 :noselect t :autokill t)
           (profiler-report-mode :size 0.3 :regexp t :autokill t :modeline minimal)
           (tabulated-list-mode :noesc t)
-          (special-mode :noselect t :autokill t :autoclose t)))
+          (special-mode :noselect t :autokill t :autoclose t)
+          ("*info*" :size 0.5 :select t :autokill t)
+          ("*Backtrace*" :size 20 :noselect t)
+          ("*Warnings*" :size 5 :noselect t :autokill t :autoclose t)
+          ("*Messages*" :size 12 :noselect t :autokill nil)
+          ("*Help*" :size 0.3)
+          ("^\\*.*Shell Command.*\\*$" :regexp t :size 20 :noselect t :autokill t)
+          ("^\\*"  :regexp t :noselect t :autokill t)
+          ("^ \\*" :regexp t :size 12 :noselect t :autokill t :autoclose t)))
 
   :config
   (if (display-graphic-p)
@@ -253,7 +254,13 @@ properties."
       (doom-popup-buffer buf)
       (with-current-buffer buf
         (setq mode-line-format "Commands: d, s, x, u; f, o, 1, 2, m, v; ~, %; q to quit; ? for help."))))
-  (advice-add #'buffer-menu :override #'doom*buffer-menu))
+  (advice-add #'buffer-menu :override #'doom*buffer-menu)
+
+  (defun doom*suppress-pop-to-buffer-same-window (orig-fn &rest args)
+    (cl-letf (((symbol-function 'pop-to-buffer-same-window)
+               (symbol-function 'pop-to-buffer)))
+      (apply orig-fn args)))
+  (advice-add #'info :around #'doom*suppress-pop-to-buffer-same-window))
 
 
 (after! comint