diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 44acd035a..b4e5547d7 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3226,7 +3226,7 @@ s   Search for keywords                 M   Like m, but only TODO entries
             (delete-window)
             (org-agenda-get-restriction-and-command prefix-descriptions))
 
-	   ((equal c ?q) (error "Abort"))
+	   ((equal c ?q) (user-error "Abort"))
 	   (t (user-error "Invalid key %c" c))))))))
 
 (defun org-agenda-fit-window-to-buffer ()