diff --git a/ChangeLog b/ChangeLog
index 69d2ed6bf713f58ad2b9b9d0837584bf00381881..eb365fbf2b33a3d23cd4316cbf281061d646dd47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,8 @@ CVS code -
 	  errors.  Also exit instead of calling usage() in the event of
 	  an invalid fill value, for consistency with how an invalid
 	  tabsize value is handled.
+	- Remove several unnecessary reset_cursor() calls. (David
+	  Benbennick)
 - files.c:
   close_open_file()
 	- Tweak to no longer rely on the return values of
@@ -65,6 +67,10 @@ CVS code -
 	  the same line. (DLR)
   do_exit()
 	- Tweak for efficiency. (David Benbennick)
+  main()
+	- Move the reset_cursor() call to the beginning of the main
+	  input loop, and remove the apparently unnecessary wrefresh()
+	  call. (David Benbennick)
 - proto.h:
 	- Change the variables in the prototypes for do_justify(),
 	  get_verbatim_kbinput(), and get_mouseinput() to match the ones
diff --git a/src/nano.c b/src/nano.c
index cada0949b751724b124680dbd8e80e07d72b3732..a8bc1b33a6b137f4c20a181cee21ba43f0b0fbb7 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2652,7 +2652,6 @@ void do_justify(int full_justify)
     /* Display the shortcut list with UnJustify. */
     shortcut_init(TRUE);
     display_main_list();
-    reset_cursor();
 
     /* Now get a keystroke and see if it's unjustify; if not, unget the
      * keystroke and return. */
@@ -3519,11 +3518,11 @@ int main(int argc, char *argv[])
 #endif
 
     edit_refresh();
-    reset_cursor();
 
     while (TRUE) {
 	keyhandled = FALSE;
 
+	reset_cursor();
 	if (ISSET(CONSTUPDATE))
 	    do_cursorpos(TRUE);
 
@@ -3642,8 +3641,6 @@ int main(int argc, char *argv[])
 			do_char((char)kbinput);
 	    }
 	}
-	reset_cursor();
-	wrefresh(edit);
     }
     assert(FALSE);
 }
diff --git a/src/winio.c b/src/winio.c
index 080f47d2c9bea208a3657bd88ac37459e87f869b..95c40800fcb84f9c6924c97618da4fec7446e09d 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2707,9 +2707,6 @@ void edit_refresh(void)
 	    nlines++;
 	}
 	reset_cursor();
-
-	/* What the hell are we expecting to update the screen if this
-	 * isn't here?  Luck? */
 	wrefresh(edit);
     }
 }
@@ -2997,8 +2994,6 @@ void do_cursorpos(int constant)
 
     old_i = i;
     old_totsize = totsize;
-
-    reset_cursor();
 }
 
 void do_cursorpos_void(void)