diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index a4e611277e4..70daa087c2b 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2962,6 +2962,8 @@ gud-hide-current-line-indicator
 (defun gud-sentinel (proc msg)
   (cond ((null (buffer-name (process-buffer proc)))
 	 ;; buffer killed
+	 ;; Stop displaying an arrow and highlight overlay in a source file.
+	 (gud-hide-current-line-indicator t)
 	 (set-process-buffer proc nil)
 	 (if (and (boundp 'speedbar-initial-expansion-list-name)
 		  (string-equal speedbar-initial-expansion-list-name "GUD"))