1 files changed, 3 insertions, 3 deletions

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 94398687d11..d71212e5dcb 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -735,9 +735,9 @@ If none, return `default-directory'."
                          ((eq major-mode 'dired-mode) (dired-get-filename t t))))
     current-prefix-arg
     shell-command-default-error-buffer))
-  (let ((default-directory (if (eq major-mode 'dired-mode)
-                               (dired-current-directory)
-                             default-directory)))
+  (let ((default-directory (or (and (eq major-mode 'dired-mode)
+                                    (dired-current-directory))
+                               default-directory)))
     (shell-command command output-buffer error-buffer)))