diff --git a/ChangeLog b/ChangeLog
index eeab326..e60754c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
   do_replace_loop()
 	- Fix various bugs having to do with replace string length
 	  and positioning (David Benbennick).
+  edit_refresh()
+	- Fix cursor being above as well as below the current screen
+	  (David Benbennick).
 - winio.c:
   bottombars()
 	- Change strcpy of gettext() "Up" string to strncpy of max
diff --git a/winio.c b/winio.c
index cca2e33..3ed4762 100644
--- a/winio.c
+++ b/winio.c
@@ -1093,7 +1093,8 @@
     if (edittop == NULL)
 	edittop = current;
 
-    if (current->lineno >= edittop->lineno + editwinrows)
+    if (current->lineno < edittop->lineno ||
+	    current->lineno >= edittop->lineno + editwinrows)
 	/* Note that edit_update() changes edittop so that
 	 * current->lineno = edittop->lineno + editwinrows / 2.  Thus
 	 * when it then calls edit_refresh(), there is no danger of