1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/files.el b/lisp/files.el
index 75a856c6362..945b7ef7371 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7406,9 +7406,9 @@ and `list-directory-verbose-switches'."
     ;; Finishing with-output-to-temp-buffer seems to clobber default-directory.
     (with-current-buffer buffer
       (setq default-directory
-            (if (file-directory-p dirname)
+            (if (file-accessible-directory-p dirname)
                 (file-name-as-directory dirname)
-              (file-name-directory dirname))))))
+              (file-name-directory (directory-file-name dirname)))))))
 
 (defun shell-quote-wildcard-pattern (pattern)
   "Quote characters special to the shell in PATTERN, leave wildcards alone.