diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index c752fd8..6ea8e24 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -114,8 +114,14 @@
   (corfu-cycle t)
   (corfu-preselect-first nil)
   (corfu-auto t)
+  (corfu-quit-no-match 'separator)
   :init
-  (global-corfu-mode))
+  (global-corfu-mode)
+  :config
+  (add-hook 'eshell-mode-hook
+          (lambda ()
+            (setq-local corfu-auto nil)
+            (corfu-mode))))
 
 (use-package dash)
 
@@ -227,7 +233,8 @@
    ns-use-proxy-icon nil
    frame-title-format nil
    auto-window-vscroll nil
-   bookmark-fringe-mark nil)
+   bookmark-fringe-mark nil
+   tab-always-indent 'complete)
 
   (setq isearch-lazy-count t
         lazy-count-prefix-format "(%s/%s) "