diff --git a/src/os_win32.c b/src/os_win32.c
index 3bfeee66ec..a743e714b7 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1656,10 +1656,10 @@ WaitForChar(long msec, int ignore_input)
 	    {
 		if (csbi.dwCursorPosition.Y != msg_row)
 		{
-		    // The screen is now messed up, must redraw the
-		    // command line and later all the windows.
+		    // The screen is now messed up, must redraw the command
+		    // line and later all the windows.
 		    redraw_all_later(CLEAR);
-		    cmdline_row -= (msg_row - csbi.dwCursorPosition.Y);
+		    compute_cmdrow();
 		    redrawcmd();
 		}
 	    }
diff --git a/src/version.c b/src/version.c
index d2ffe6ff9c..4770cb305d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2841,
 /**/
     2840,
 /**/