diff --git a/README.org b/README.org
index 31fc0b42..44c75be2 100644
--- a/README.org
+++ b/README.org
@@ -1430,7 +1430,7 @@ Let's add our own eshell prompt. and set the password cache to a significantly h
     :keymaps 'override
     "oe" 'eshell)
   (general-def '(normal insert) eshell-mode-map
-    "C-d" 'kill-this-buffer))
+    "C-d" 'kill-buffer-and-window))
 #+end_src
 
 ** Sly
@@ -1464,7 +1464,7 @@ Let's use pdf-tools for a lot better interaction with pdfs.
 #+begin_src emacs-lisp
 (setq display-buffer-alist
       '(("\\*e?shell\\*"
-	 (display-buffer-in-side-window)
+	 (display-buffer--maybe-pop-up-frame-or-window)
 	 (window-width . 0.4)
 	 (side . bottom))
 	("*Bongo-Elfeed Queue*"
diff --git a/init.el b/init.el
index 5c3a9a3c..9fa1033a 100644
--- a/init.el
+++ b/init.el
@@ -1087,7 +1087,7 @@ If on a:
     :keymaps 'override
     "oe" 'eshell)
   (general-def '(normal insert) eshell-mode-map
-    "C-d" 'kill-this-buffer))
+    "C-d" 'kill-buffer-and-window))
 
 (use-package sly
   :mode ("\\.lisp\\'" . sly-mode))
@@ -1107,7 +1107,7 @@ If on a:
 
 (setq display-buffer-alist
       '(("\\*e?shell\\*"
-	 (display-buffer-in-side-window)
+	 (display-buffer--maybe-pop-up-frame-or-window)
 	 (window-width . 0.4)
 	 (side . bottom))
 	("*Bongo-Elfeed Queue*"