diff --git a/lisp/org-fold.el b/lisp/org-fold.el
index 4052a59b0..754cb2ee4 100644
--- a/lisp/org-fold.el
+++ b/lisp/org-fold.el
@@ -595,7 +595,8 @@ Return a non-nil value when toggling is successful."
 
 (defun org-fold-hide-drawer-all (&optional begin end)
   "Fold all drawers in the current buffer or active region BEGIN..END."
-  (interactive "r")
+  (interactive (list (and (use-region-p) (region-beginning))
+                     (and (use-region-p) (region-end))))
   (let ((begin (or begin (point-min)))
         (end (or end (point-max))))
     (org-fold--hide-drawers begin end)))