diff --git a/contrib/less/main.c b/contrib/less/main.c
index d1d07ff8a6c1..17201a9da063 100644
--- a/contrib/less/main.c
+++ b/contrib/less/main.c
@@ -165,8 +165,10 @@ main(argc, argv)
 		quit(QUIT_OK);
 	}
 
-	if (less_is_more || get_quit_at_eof())
-		no_init = quit_if_one_screen = TRUE;
+	if (less_is_more)
+		no_init = TRUE;
+	if (less_is_more && get_quit_at_eof())
+		quit_if_one_screen = TRUE;
 
 #if EDITOR
 	editor = lgetenv("VISUAL");