diff --git a/src/getchar.c b/src/getchar.c
index 209ee06f07..704d4d3954 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3239,6 +3239,9 @@ vgetorpeek(int advance)
 		    if (pending_exmode_active)
 			exmode_active = EXMODE_NORMAL;
 
+		    // no chars to block abbreviation for
+		    typebuf.tb_no_abbr_cnt = 0;
+
 		    break;
 		}
 
diff --git a/src/testdir/test_feedkeys.vim b/src/testdir/test_feedkeys.vim
index 38b2f9f687..f343b0174c 100644
--- a/src/testdir/test_feedkeys.vim
+++ b/src/testdir/test_feedkeys.vim
@@ -13,4 +13,14 @@ func Test_feedkeys_x_with_empty_string()
   quit!
 endfunc
 
+func Test_feedkeys_with_abbreviation()
+  new
+  inoreabbrev trigger value
+  call feedkeys("atrigger ", 'x')
+  call feedkeys("atrigger ", 'x')
+  call assert_equal('value value ', getline(1))
+  bwipe!
+  iunabbrev trigger
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 6499548706..195c3d5eea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3966,
 /**/
     3965,
 /**/