diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 35b3f1f99..8613fe7bc 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -55,7 +55,9 @@
                   #'company-indent-or-complete-common)))
            ,@(when (modulep! :completion corfu)
                '(((bound-and-true-p corfu-mode)
-                  #'indent-for-tab-command))))))
+                  (if (derived-mode-p 'eshell-mode 'comint-mode)
+                      #'completion-at-point
+                    #'indent-for-tab-command)))))))
       :m [tab]
       `(menu-item "Evil motion smart tab" nil :filter
         (lambda (cmd)