diff --git a/.emacs.d/lisp/init-eshell.el b/.emacs.d/lisp/init-eshell.el
index 653d6416..aecdd0d8 100644
--- a/.emacs.d/lisp/init-eshell.el
+++ b/.emacs.d/lisp/init-eshell.el
@@ -18,6 +18,9 @@
 
 (setq
  eshell-ls-use-colors t
+ ;; ffap-shell-prompt-regexp changes the behaviour of `helm-find-files' when
+ ;; point is on prompt. I find this disturbing.
+ ffap-shell-prompt-regexp nil
  eshell-destroy-buffer-when-process-dies t)
 
 ;; TODO: Hour is printed twice. We don't need to set this?
diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el
index 69f80f14..1ee69e02 100644
--- a/.emacs.d/lisp/init-evil.el
+++ b/.emacs.d/lisp/init-evil.el
@@ -216,8 +216,6 @@ See `eshell' for the numeric prefix arg."
   (evil-define-key '(normal insert) eshell-mode-map "\M-l" 'eshell-forward-argument))
 (add-hook 'eshell-first-time-mode-hook 'evil/eshell-set-keys)
 
-;; TODO: When point is on "> ", helm-find-files looks up parent folder. Prevent that.
-
 ;; TODO: Make Evil commands react more dynamically with read-only text.
 ;; Add support for I, C, D, S, s, c*, d*, R, r.
 ;; See https://github.com/emacs-evil/evil/issues/852