diff --git a/src/normal.c b/src/normal.c
index 4a86e7560..dd79a43aa 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1026,7 +1026,12 @@ getcount:
 	out_flush();
 #endif
     if (ca.cmdchar != K_IGNORE)
-	did_cursorhold = save_did_cursorhold;
+    {
+	if (ex_normal_busy)
+	    did_cursorhold = save_did_cursorhold;
+	else
+	    did_cursorhold = FALSE;
+    }
 
     State = NORMAL;
 
diff --git a/src/version.c b/src/version.c
index cc7fbfbfe..1aacd3b39 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1258,
 /**/
     1257,
 /**/