diff --git a/contrib/src/stc/scintilla/src/Editor.cxx b/contrib/src/stc/scintilla/src/Editor.cxx
index 87a0391b48..a69194f97e 100644
--- a/contrib/src/stc/scintilla/src/Editor.cxx
+++ b/contrib/src/stc/scintilla/src/Editor.cxx
@@ -519,7 +519,10 @@ int Editor::LinesOnScreen() {
 	PRectangle rcClient = GetClientRectangle();
 	int htClient = rcClient.bottom - rcClient.top;
 	//Platform::DebugPrintf("lines on screen = %d\n", htClient / lineHeight + 1);
-	return htClient / vs.lineHeight;
+	int n = htClient / vs.lineHeight;
+        if (n < 0)
+            n = 0;
+        return n;
 }
 
 int Editor::LinesToScroll() {
diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
index 87a0391b48..a69194f97e 100644
--- a/src/stc/scintilla/src/Editor.cxx
+++ b/src/stc/scintilla/src/Editor.cxx
@@ -519,7 +519,10 @@ int Editor::LinesOnScreen() {
 	PRectangle rcClient = GetClientRectangle();
 	int htClient = rcClient.bottom - rcClient.top;
 	//Platform::DebugPrintf("lines on screen = %d\n", htClient / lineHeight + 1);
-	return htClient / vs.lineHeight;
+	int n = htClient / vs.lineHeight;
+        if (n < 0)
+            n = 0;
+        return n;
 }
 
 int Editor::LinesToScroll() {