diff --git a/lisp/org.el b/lisp/org.el
index 650b6ba2b..98443b508 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -20236,9 +20236,12 @@ This command does many different things, depending on context:
 	  ((bold code entity export-snippet inline-babel-call inline-src-block
 		 italic latex-fragment line-break macro strike-through subscript
 		 superscript underline verbatim)
-	   (while (and (setq context (org-element-property :parent context))
-		       (not (memq (setq type (org-element-type context))
-				  '(paragraph verse-block)))))))
+	   (while (and (not (memq (setq type (org-element-type context))
+				  '(paragraph verse-block)))
+		       (org-element-property
+			:parent
+			(org-element-property :parent context)))
+	     (setq context (org-element-property :parent context)))))
 	;; For convenience: at the first line of a paragraph on the
 	;; same line as an item, apply function on that item instead.
 	(when (eq type 'paragraph)