diff --git a/thoom-emacs/init.el b/thoom-emacs/init.el
index 7f75dea..dc252e1 100644
--- a/thoom-emacs/init.el
+++ b/thoom-emacs/init.el
@@ -465,7 +465,18 @@
           "\\*Compile-Log\\*"
           "\\*Flycheck errors\\*"
           help-mode
-          compilation-mode))
+          compilation-mode
+          "\\*eshell.*\\*" eshell-mode))
+
+  (defun thoom/popper-window-height (window)
+    "Make eshell popups take half the frame height, otherwise defer to popper--fit-window-height"
+    (let ((buffer (window-buffer window)))
+      (if (with-current-buffer buffer
+             (derived-mode-p 'eshell-mode))
+          (/ (frame-height (window-frame window)) 2)
+        (popper--fit-window-height window))))
+
+  (setq popper-window-height #'thoom/popper-window-height)
   (setq popper-group-function #'popper-group-by-project)
   (popper-mode +1)
   (popper-echo-mode +1))
@@ -818,6 +829,7 @@
 ;;; Eshell
 ;;;; Eshell
 (use-package eshell
+  :bind (("M-`" . eshell))
   :config
   (setq eshell-destroy-buffer-when-process-dies t
         eshell-visual-commands '()
@@ -856,13 +868,6 @@ any directory proferred by `consult-dir'."
     "Convert rx-compatible regular expressions to PCRE."
     `(rxt-elisp-to-pcre (rx ,@rx-sexp))))
 
-(use-package eshell-toggle
-  :ensure t
-  :custom
-  (eshell-toggle-size-fraction 2)
-  (eshell-toggle-window-side 'below)
-  :bind (("M-`" . eshell-toggle)))
-
 (use-package eshell-p10k
   :ensure (:host github :repo "elken/eshell-p10k")
   :config