diff --git a/src/gui.c b/src/gui.c
index 2ce3009278..e6cc544dce 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1118,6 +1118,8 @@ gui_update_cursor(
 	gui_mch_set_blinking(shape->blinkwait,
 			     shape->blinkon,
 			     shape->blinkoff);
+	if (shape->blinkoff == 0 || shape->blinkon == 0 || shape->blinkoff == 0)
+	    gui_mch_stop_blink();
 #ifdef FEAT_TERMINAL
 	if (shape_bg != INVALCOLOR)
 	{
diff --git a/src/version.c b/src/version.c
index 871a0e9bfd..1fd6502c9e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1294,
 /**/
     1293,
 /**/