diff --git a/init.el b/init.el
index d6b02dc..a56177b 100644
--- a/init.el
+++ b/init.el
@@ -1146,8 +1146,11 @@ argument."
          (eshell-load . eat-eshell-mode)
          (eshell-mode . my/-eshell-mode-setup))
   :bind (:map eshell-mode-map
+         ("TAB" . company-complete)
          ("<tab>" . company-complete)
-         ("TAB" . company-complete))
+         :map eshell-cmpl-mode-map
+         ("TAB" . company-complete)
+         ("<tab>" . company-complete))
   :init
   (defun my/-eshell-mode-setup ()
     "Setup function run from `eshell-mode-hook'"