diff --git a/src/option.c b/src/option.c
index d0e55a9..8911b01 100644
--- a/src/option.c
+++ b/src/option.c
@@ -8528,11 +8528,7 @@
 	}
 	Columns = MIN_COLUMNS;
     }
-    /* Limit the values to avoid an overflow in Rows * Columns. */
-    if (Columns > 10000)
-	Columns = 10000;
-    if (Rows > 1000)
-	Rows = 1000;
+    limit_screen_size();
 
 #ifdef DJGPP
     /* avoid a crash by checking for a too large value of 'columns' */