diff --git a/lisp/ox.el b/lisp/ox.el
index 5b4134ecc..98846540d 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6929,8 +6929,8 @@ options as CDR."
       (org-export--dispatch-ui options first-key expertp))
      ;; q key at first level aborts export.  At second level, cancel
      ;; first key instead.
-     ((eq key ?q) (if (not first-key) (error "Export aborted")
-		    (org-export--dispatch-ui options nil expertp)))
+     ((eq key ?q) (if first-key (org-export--dispatch-ui options nil expertp)
+		    (message "Export aborted") '(ignore)))
      ;; Help key: Switch back to standard interface if expert UI was
      ;; active.
      ((eq key ??) (org-export--dispatch-ui options first-key nil))