diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1eaad1f0061..fbf76180037 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* menu-bar.el (minibuffer-local-map): Use the same command for the
+	"Quit" menu as used for the C-g key, so the shortcut displayed is C-g.
+	Prefer RET over C-j for exit-minibuffer.
+
 	* files.el (display-buffer-other-frame): Eliminate problematic code.
 
 	* menu-bar.el (menu-bar-update-buffers-maxbuf): Remove.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 6ed2e4904f7..46c6b598c6d 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1714,10 +1714,11 @@ Buffers menu is regenerated."
 
 (let ((map minibuffer-local-map))
   (define-key map [menu-bar minibuf quit]
-    (list 'menu-item "Quit" 'keyboard-escape-quit
+    (list 'menu-item "Quit" 'abort-recursive-edit
 	  :help "Abort input and exit minibuffer"))
   (define-key map [menu-bar minibuf return]
     (list 'menu-item "Enter" 'exit-minibuffer
+          :key-sequence "\r"
 	  :help "Terminate input and exit minibuffer"))
   (define-key map [menu-bar minibuf isearch-forward]
     (list 'menu-item "Isearch History Forward" 'isearch-forward