       ;; an arbitrary window.
       (if gud-last-frame
           (rdebug-pick-source-window))
+
+      (rdebug-local-short-key-mode-on)
 
       ;; Does the remaining text look like it might end with the
       ;; beginning of another marker?  If it does, then keep it in

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

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

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

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