1 files changed, 4 insertions, 3 deletions

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 19d36c3a97b..0e44656f2a4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3721,9 +3721,9 @@ support symbolic links."
             (if (process-live-p p)
               ;; Display output.
               (with-current-buffer output-buffer
-                (display-buffer output-buffer '(nil (allow-no-window . t)))
                 (setq mode-line-process '(":%s"))
-                (shell-mode)
+                (unless (eq major-mode 'shell-mode)
+                  (shell-mode))
                 (set-process-filter p #'comint-output-filter)
                 (set-process-sentinel p #'shell-command-sentinel)
                 (when error-file
@@ -3733,7 +3733,8 @@ support symbolic links."
                      (with-current-buffer error-buffer
                        (insert-file-contents-literally
                         error-file nil nil nil 'replace))
-                     (delete-file error-file)))))
+                     (delete-file error-file))))
+                (display-buffer output-buffer '(nil (allow-no-window . t))))
 
               (when error-file
                 (delete-file error-file)))))