diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index bd5e32940..7915f7f0c 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -712,7 +712,8 @@ already gone."
       (setq level 1)
       (if reversed
 	  (progn (goto-char (point-min))
-		 (outline-next-heading))
+		 (or (org-at-heading-p)
+		     (outline-next-heading)))
 	(goto-char (point-max))
 	(or (bolp) (insert "\n"))))
      (t