diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 24d5469..71dc574 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2603,7 +2603,12 @@ comint mode, which see."
 		      file-subst)))
 	 (filepart (and file-word (concat "-" (file-name-nondirectory file))))
 	 (existing-buffer (get-buffer (concat "*gud" filepart "*"))))
-    (switch-to-buffer (concat "*gud" filepart "*"))
+    (select-window
+      (display-buffer
+       (get-buffer-create (concat "*gud" filepart "*"))
+       '(display-buffer-reuse-window 
+         display-buffer-in-previous-window
+         display-buffer-same-window display-buffer-pop-up-window)))
     (when (and existing-buffer (get-buffer-process existing-buffer))
       (error "This program is already being debugged"))
     ;; Set the dir, in case the buffer already existed with a different dir.