diff --git a/lisp/dired.el b/lisp/dired.el
index 3790197f66..a97604c4a0 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1272,6 +1272,7 @@ dired-find-buffer-nocreate
   ;; This differs from dired-buffers-for-dir in that it does not consider
   ;; subdirs of default-directory and searches for the first match only.
   ;; Also, the major mode must be MODE.
+  (let ((non-essential t))
   (if (and (featurep 'dired-x)
            dired-find-subdir
            ;; Don't try to find a wildcard as a subdirectory.
@@ -1304,7 +1305,7 @@ dired-find-buffer-nocreate
                 (setq found (cdr (car blist))
                       blist nil)
               (setq blist (cdr blist))))))
-      found)))
+      found))))

 
 ;;; Read in a new dired buffer
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index fd18b3f05c..805be8270a 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4957,6 +4957,7 @@ tramp-maybe-open-connection
     ;; If Tramp opens the same connection within a short time frame,
     ;; there is a problem.  We shall signal this.
     (unless (or (process-live-p p)
+                (and (processp p) (not non-essential))
 		(not (tramp-file-name-equal-p
 		      vec (car tramp-current-connection)))
 		(time-less-p