diff --git a/src/nano.c b/src/nano.c
index 43797252804b2be6faf98f156e6a56abaf3f860c..5e4bb0d9db65d40054d98b148877dbbb41136a87 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1635,13 +1635,6 @@ int do_input(bool allow_funcs)
      * all available characters in the input puddle.  Note that this
      * puddle will be empty if we're in view mode. */
     if (have_shortcut || get_key_buffer_len() == 0) {
-#ifdef ENABLE_WRAPPING
-	/* If we got a shortcut or toggle, and it's not the shortcut
-	 * for verbatim input, turn off prepending of wrapped text. */
-	if (have_shortcut && s->scfunc != do_verbatim_input)
-	    wrap_reset();
-#endif
-
 	if (puddle != NULL) {
 	    /* Insert all bytes in the input buffer into the edit buffer
 	     * at once, filtering out any low control codes. */
@@ -1709,6 +1702,11 @@ int do_input(bool allow_funcs)
 		refresh_needed = TRUE;
 	    }
 #endif
+#ifdef ENABLE_WRAPPING
+	    /* If the cursor moved to another line, clear the prepend flag. */
+	    if (openfile->current != was_current)
+		wrap_reset();
+#endif
 #ifdef ENABLE_COLOR
 	    if (f && !f->viewok)
 		check_the_multis(openfile->current);