1 files changed, 6 insertions, 4 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index 15a79f6f5bf..536289c3891 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1890,10 +1890,12 @@ we put it on this frame."
       (when frame
         (let* ((img (create-image (fancy-splash-image-file)))
                (image-height (and img (cdr (image-size img nil frame))))
-               ;; We test frame-height so that, if the frame is split
-               ;; by displaying a warning, that doesn't cause the normal
-               ;; splash screen to be used.
-               (frame-height (1- (frame-height frame))))
+               ;; We test frame-height and not window-height so that,
+               ;; if the frame is split by displaying a warning, that
+               ;; doesn't cause the normal splash screen to be used.
+               ;; We subtract 2 from frame-height to account for the
+               ;; echo area and the mode line.
+               (frame-height (- (frame-height frame) 2)))
           (> frame-height (+ image-height 19)))))))