diff --git a/edit/ChangeLog b/edit/ChangeLog
index 539af4390..f20524140 100644
--- a/edit/ChangeLog
+++ b/edit/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-22  Pavel Roskin  <proski@gnu.org>
+
+	* editdraw.c (edit_scroll_screen_over_cursor): Do nothing if the
+	edit widget has zero width or height.
+
 2002-01-21  Pavel Roskin  <proski@gnu.org>
 
 	* edit.c: Rename DELETE to DELCHAR to avoid macro redefinition
diff --git a/edit/editdraw.c b/edit/editdraw.c
index 949352362..5a909d4d8 100644
--- a/edit/editdraw.c
+++ b/edit/editdraw.c
@@ -136,6 +136,10 @@ void edit_scroll_screen_over_cursor (WEdit * edit)
     int p;
     int outby;
     int b_extreme, t_extreme, l_extreme, r_extreme;
+
+    if (edit->num_widget_lines <= 0 || edit->num_widget_columns <= 0)
+	return;
+
     r_extreme = EDIT_RIGHT_EXTREME;
     l_extreme = EDIT_LEFT_EXTREME;
     b_extreme = EDIT_BOTTOM_EXTREME;