diff --git a/src/os_win32.c b/src/os_win32.c
index a743e714b..8a1ed72d7 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1648,7 +1648,9 @@ WaitForChar(long msec, int ignore_input)
 	peek_console_input(g_hConIn, &ir, 1, &cRecords);
 
 # ifdef FEAT_MBYTE_IME
-	if (State & CMDLINE && msg_row == Rows - 1)
+	// May have to redraw if the cursor ends up in the wrong place.
+	// Only when not peeking.
+	if (State & CMDLINE && msg_row == Rows - 1 && msec != 0)
 	{
 	    CONSOLE_SCREEN_BUFFER_INFO csbi;
 
diff --git a/src/version.c b/src/version.c
index 7fd433822..7f163f8a3 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 */
+/**/
+    2874,
 /**/
     2873,
 /**/