1 files changed, 4 insertions, 2 deletions

diff --git a/lisp/files.el b/lisp/files.el
index 5ed1ad4b7ab..8edf13a5c4d 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -258,8 +258,10 @@ Not actually set up until the first time you you use it.")
            (setq cd-list
                  (nconc cd-list
                         (list (substitute-in-file-name
-                               (file-name-as-directory
-                                (substring cd-path cd-start cd-colon))))))
+                               (if (= cd-start cd-colon)
+                                   "."
+                                 (file-name-as-directory
+                                  (substring cd-path cd-start cd-colon)))))))
            (setq cd-start (+ cd-colon 1)))
          cd-list)))