diff --git a/modules/editor/fold/autoload/fold.el b/modules/editor/fold/autoload/fold.el
index 7105885d9..69726ebaa 100644
--- a/modules/editor/fold/autoload/fold.el
+++ b/modules/editor/fold/autoload/fold.el
@@ -27,7 +27,10 @@
   (save-excursion
     (ignore-errors
       (or (hs-looking-at-block-start-p)
-          (hs-find-block-beginning)))))
+          (hs-find-block-beginning)
+          (unless (eolp)
+            (end-of-line)
+            (+fold--hideshow-fold-p))))))
 
 (defun +fold--invisible-points (count)
   (let (points)