1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index fdf6cc1dbaa..c1e56fcdff3 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1903,7 +1903,8 @@ we put it on this frame."
       (if (and (frame-visible-p frame)
                (not (window-minibuffer-p (frame-selected-window frame))))
           (setq chosen-frame frame)))
-    chosen-frame))
+    ;; If there are no visible frames yet, try the selected one.
+    (or chosen-frame (selected-frame))))
 
 (defun use-fancy-splash-screens-p ()
   "Return t if fancy splash screens should be used."