                    (eq process (get-buffer-process gud-comint-buffer)))
                (eq rdebug-window-configuration-state 'debugger)
                (not (eq (process-status process) 'run)))
-      (rdebug-set-window-configuration-state 'original))
-    ;; This unbinds the special debugger keys of the source buffers.
-    (setcdr (assq 'rdebug-debugger-support-minor-mode minor-mode-map-alist)
-            rdebug-debugger-support-minor-mode-map-when-deactive)))
+      (rdebug-local-short-key-mode-off)
+      (rdebug-set-window-configuration-state 'original)
+      ;; This unbinds the special debugger keys of the source buffers.
+      (setcdr (assq 'rdebug-debugger-support-minor-mode minor-mode-map-alist)
+              rdebug-debugger-support-minor-mode-map-when-deactive))))
 
 
 ;; -- Reset support

    (rdebug-populate-secondary-buffer-map map)

    ;; --------------------
    ;; The "Stack window" submeny.
    (let ((submenu (make-sparse-keymap)))
      (define-key-after map [menu-bar debugger stack]
        (cons "Stack window" submenu)

    (rdebug-populate-secondary-buffer-map map)

    ;; --------------------
    ;; The "Watch window" submenu.
    (let ((submenu (make-sparse-keymap)))
      (define-key-after map [menu-bar debugger watch]
        (cons "Watch window" submenu)
