1 files changed, 7 insertions, 5 deletions

diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index fb1fedc9c54..2a495225dc2 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -299,11 +299,13 @@ line of the form #!<interp>."
       (let ((fullname (if (file-name-directory file) file
                         (eshell-search-path file)))
             (suffixes eshell-binary-suffixes))
-        (if (and fullname
-                 (not (file-remote-p fullname))
-                 (file-remote-p default-directory))
-            (setq fullname (expand-file-name
-                            (concat "./" fullname) default-directory)))
+        (when (and fullname
+                   (not (file-remote-p fullname))
+                   (file-remote-p default-directory))
+          (setq fullname
+                (if (file-name-absolute-p fullname)
+                    (concat (file-remote-p default-directory) fullname)
+                  (expand-file-name fullname default-directory))))
         (if (and fullname (not (or eshell-force-execution
                                    (file-executable-p fullname))))
             (while suffixes