1 files changed, 5 insertions, 4 deletions

diff --git a/lisp/startup.el b/lisp/startup.el
index 9aceed403ea..68f857cde74 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -947,10 +947,11 @@ Type \\[describe-distribution] for information on getting the latest version."))
                          (setq line 0))))))))
       ;; If 3 or more files visited, and not all visible,
       ;; show user what they all are.
-      (if (> file-count 2)
-          (or (get-buffer-window first-file-buffer)
-              (progn (other-window 1)
-                     (buffer-menu)))))))
+      (and (> file-count 2)
+           (not noninteractive)
+           (or (get-buffer-window first-file-buffer)
+               (progn (other-window 1)
+                      (buffer-menu)))))))
 
 (defun command-line-normalize-file-name (file)
   "Collapse multiple slashes to one, to handle non-Emacs file names."