diff --git a/lisp/org.el b/lisp/org.el
index 42375da76..e1a0714a2 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18796,6 +18796,8 @@ See the individual commands for more information."
   (interactive "P")
   (cond
    ((run-hook-with-args-until-success 'org-metareturn-hook))
+   ((or (org-at-drawer-p) (org-at-property-p))
+    (newline-and-indent))
    ((org-at-table-p)
     (call-interactively 'org-table-wrap-region))
    (t (call-interactively 'org-insert-heading))))