diff --git a/src/screen.c b/src/screen.c
index 9bac8bc..97d636d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5371,6 +5371,12 @@
 # define CHAR_CELLS 1
 #endif
 
+    /* Check for illegal row and col, just in case. */
+    if (row >= Rows)
+	row = Rows - 1;
+    if (endcol > Columns)
+	endcol = Columns;
+
 # ifdef FEAT_CLIPBOARD
     clip_may_clear_selection(row, row);
 # endif