1 files changed, 7 insertions, 2 deletions

diff --git a/lisp/info.el b/lisp/info.el
index 4a7eea2bca1..94c71c2f841 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -527,8 +527,13 @@ In standalone mode, \\<Info-mode-map>\\[Info-exit] exits Emacs itself."
                       (goto-char (setq anchorpos guesspos))
 
                     ;; Else we may have a node, which we search for:
-                    (goto-char (max (point-min)
-                                    (- (byte-to-position guesspos) 1000)))
+                    (let ((guesschar
+                           (or (byte-to-position guesspos)
+                               (if (< (position-bytes (point-max)) guesspos)
+                                   (point-max)
+                                 (point-min)))))
+                      (goto-char (max (point-min)
+                                      (- guesschar 1000))))
                     ;; Now search from our advised position
                     ;; (or from beg of buffer)
                     ;; to find the actual node.