diff --git a/lisp/org-table.el b/lisp/org-table.el
index 92490f9f6..2e438792b 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -487,6 +487,11 @@ This may be useful when columns have been shrunk."
             (delete-overlay org-table-header-overlay))
           (let* ((ws (window-start))
                  (beg (save-excursion
+                        ;; Check table at window start, not at point.
+                        ;; Point might be after the table, or at
+                        ;; another table located below the one visible
+                        ;; on top.
+                        (goto-char ws)
                         (goto-char (org-table-begin))
                         (while (or (org-at-table-hline-p)
                                    (looking-at-p ".*|\\s-+<[rcl]?\\([0-9]+\\)?>"))