diff --git a/.emacs.d/lisp/init-eshell.el b/.emacs.d/lisp/init-eshell.el
index 00d91a65..18634a85 100644
--- a/.emacs.d/lisp/init-eshell.el
+++ b/.emacs.d/lisp/init-eshell.el
@@ -297,4 +297,7 @@ This should be faster then `seq-uniq'."
   (setq epe-path-style 'full)
   (setq eshell-prompt-function #'epe-theme-multiline-with-status))
 
+(when (require 'helm-fish-completion nil 'noerror)
+  (add-hook 'eshell-mode-hook 'helm-fish-completion-set-keys))
+
 (provide 'init-eshell)