diff --git a/lisp/org-element.el b/lisp/org-element.el
index 59a7fd461..63e7c5632 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -1095,7 +1095,9 @@ Assume point is at beginning of the headline."
 	   (commentedp
 	    (and (let ((case-fold-search nil))
                    (looking-at org-element-comment-string))
-		 (goto-char (match-end 0))))
+		 (goto-char (match-end 0))
+                 (when (looking-at-p "\\(?:[ \t]\\|$\\)")
+                   (point))))
 	   (title-start (prog1 (point)
                           (unless (or todo priority commentedp)
                             ;; Headline like "* :tag:"