diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 6357c4f2d3e..f1c3e75bb73 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2994,9 +2994,8 @@ killed."
                   (mapconcat #'identity args " ")))
             (with-current-buffer buffer
               (inferior-python-mode))
+            (when show (display-buffer buffer))
             (and internal (set-process-query-on-exit-flag process nil))))
-        (when show
-          (pop-to-buffer proc-buffer-name))
         proc-buffer-name))))
 
 ;;;###autoload
@@ -3028,6 +3027,7 @@ process buffer for a list of commands.)"
          (python-shell-make-comint
           (or cmd (python-shell-calculate-command))
           (python-shell-get-process-name dedicated) show)))
+    (set-buffer buffer)
     (get-buffer-process buffer)))
 
 (defun run-python-internal ()