diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el
index 0c97a9113..7b792b158 100644
--- a/modules/term/eshell/config.el
+++ b/modules/term/eshell/config.el
@@ -45,7 +45,7 @@ You should use `set-eshell-alias!' to change this.")
 
 
 (defvar +eshell--default-aliases nil)
-(defvar +eshell--company-backends '(company-files company-capf))
+(defvar +eshell--company-backends '((company-capf :separate company-files)))
 
 
 ;;
@@ -152,7 +152,8 @@ You should use `set-eshell-alias!' to change this.")
             [remap doom/backward-to-bol-or-indent] #'eshell-bol
             [remap doom/backward-kill-to-bol-and-indent] #'eshell-kill-input
             [remap evil-window-split]   #'+eshell/split-below
-            [remap evil-window-vsplit]  #'+eshell/split-right))
+            [remap evil-window-vsplit]  #'+eshell/split-right)))
+  (add-hook! 'eshell-mode-hook
     (defun +eshell-init-company-h ()
       (when (and (featurep! :completion company)
                  +eshell--company-backends)
@@ -182,9 +183,3 @@ You should use `set-eshell-alias!' to change this.")
 (use-package! esh-help
   :after eshell
   :config (setup-esh-help-eldoc))
-
-
-(use-package! esh-autosuggest
-  :after eshell
-  :init (add-to-list '+eshell--company-backends 'esh-autosuggest)
-  :config (setq esh-autosuggest-use-company-map t))
diff --git a/modules/term/eshell/packages.el b/modules/term/eshell/packages.el
index 9599d58d8..31920f973 100644
--- a/modules/term/eshell/packages.el
+++ b/modules/term/eshell/packages.el
@@ -5,4 +5,3 @@
 (package! eshell-z)
 (package! shrink-path)
 (package! esh-help)
-(package! esh-autosuggest)