diff --git a/lisp/org.el b/lisp/org.el
index 55b32b651..ff59b6779 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6313,6 +6313,8 @@ in special contexts.
 	  (org-list-set-item-visibility (point-at-bol) struct 'children)
 	(org-show-entry)
 	(show-children)
+	(when (memq 'org-cycle-hide-drawers org-cycle-hook)
+	  (org-cycle-hide-drawers 'subtree))
 	;; Fold every list in subtree to top-level items.
 	(when (eq org-cycle-include-plain-lists 'integrate)
 	  (save-excursion