diff --git a/lisp/org.el b/lisp/org.el
index 2e63f5340..b9f422954 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4994,7 +4994,7 @@ in special contexts.
 	(skip-chars-forward " \t\n")
 	(beginning-of-line 1) ; in case this is an item
 	)
-      (setq eos (1- (point))))
+      (setq eos (if (eobp) (point) (1- (point)))))
     ;; Find out what to do next and set `this-command'
     (cond
      ((= eos eoh)