diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index d84e92fc013..3e2e3b6c6f2 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -4695,7 +4695,7 @@ contents."
   (interactive "P")
   (condition-case nil
       (minibuffer-choose-completion no-exit no-quit)
-    (error (exit-minibuffer))))
+    (error (minibuffer-complete-and-exit))))
 
 (defun minibuffer-complete-history ()
   "Complete the minibuffer history as far as possible.