diff --git a/src/buffer.c b/src/buffer.c
index b3e2bc3..bb9c773 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4164,6 +4164,7 @@
     stl_hlrec_T *sp;
     int		save_must_redraw = must_redraw;
     int		save_redr_type = curwin->w_redr_type;
+    int		save_KeyTyped = KeyTyped;
 
     if (stl_items == NULL)
     {
@@ -5060,6 +5061,9 @@
 	curwin->w_redr_type = save_redr_type;
     }
 
+    // A user function may reset KeyTyped, restore it.
+    KeyTyped = save_KeyTyped;
+
     return width;
 }
 #endif // FEAT_STL_OPT
diff --git a/src/screen.c b/src/screen.c
index 9010090..adcc4b5 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1235,7 +1235,6 @@
     int		use_sandbox = FALSE;
     win_T	*ewp;
     int		p_crb_save;
-    int		save_KeyTyped = KeyTyped;
 
     // There is a tiny chance that this gets called recursively: When
     // redrawing a status line triggers redrawing the ruler or tabline.
@@ -1395,9 +1394,6 @@
 
 theend:
     entered = FALSE;
-
-    // A user function may reset KeyTyped, restore it.
-    KeyTyped = save_KeyTyped;
 }
 
 #endif // FEAT_STL_OPT
diff --git a/src/version.c b/src/version.c
index 8edb112..e5bbd10 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4391,
+/**/
     4390,
 /**/
     4389,