Index: main/org-autofocus.el
===================================================================
--- main/org-autofocus.el	(revision main,16)
+++ main/org-autofocus.el	(revision main,17)
@@ -134,9 +134,10 @@
 
       (save-excursion
-        ;; Go to previous mark, if any
+        ;; Go to previous mark, if any, or first task otherwise.
         (while (and (= (forward-line -1) 0)
-                    (setq bol (line-beginning-position))
-                    (get-text-property bol 'type)
+                    (get-text-property (point) 'type)
+                    (setq bol (point))
                     (not (org-af--marked-p bol))))
+        (goto-char bol)
 
         (when (org-af--marked-p bol)
@@ -146,5 +147,5 @@
 
         (forward-line)
-        (setq bol (line-beginning-position))
+        (setq bol (point))
         (if marked
             (add-text-properties bol task-point '(category org-af-hidden))