diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 5bbf5e34e..78f67cccf 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4261,8 +4261,9 @@ items if they have an hour specification like [h]h:mm."
 	  (insert tbl)))
       (goto-char (point-min))
       (or org-agenda-multi (org-agenda-fit-window-to-buffer))
-      (unless (and (pos-visible-in-window-p (point-min))
-		   (pos-visible-in-window-p (point-max)))
+      (unless (or (not (get-buffer-window))
+		  (and (pos-visible-in-window-p (point-min))
+		       (pos-visible-in-window-p (point-max))))
 	(goto-char (1- (point-max)))
 	(recenter -1)
 	(if (not (pos-visible-in-window-p (or start-pos 1)))