diff --git a/lisp/org.el b/lisp/org.el
index 7420d10b7..c0dc9d9af 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9243,7 +9243,7 @@ property to set."
 	   (save-excursion
 	     (org-back-to-heading t)
 	     (put-text-property
-	      (point-at-bol) (point-at-eol) tprop p))))))))
+	      (point-at-bol) (org-end-of-subtree t t) tprop p))))))))
 
 
 ;;;; Link Stuff