1 files changed, 3 insertions, 3 deletions

diff --git a/lisp/shell.el b/lisp/shell.el
index 3e06801e7af..8c5781f9333 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -650,9 +650,9 @@ Otherwise, one argument `-i' is passed to the shell.
                 t shell-file-name))
               'localname))))
 
-  ;; Pop to buffer, so that the buffer's window will be correctly set
-  ;; when we call comint (so that comint sets the COLUMNS env var properly).
-  (pop-to-buffer buffer)
+  ;; The buffer's window must be correctly set when we call comint (so
+  ;; that comint sets the COLUMNS env var properly).
+  (switch-to-buffer buffer)
   (unless (comint-check-proc buffer)
     (let* ((prog (or explicit-shell-file-name
                      (getenv "ESHELL") shell-file-name))