gistfile1.diff

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 26f4219..1f19c88 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10068,7 +10068,9 @@ exec_normal(int was_typed)
 		    && typebuf.tb_len > 0)) && !got_int)
     {
 	update_topline_cursor();
+	++ex_normal_busy;
 	normal_cmd(&oa, TRUE);	/* execute a Normal mode cmd */
+	--ex_normal_busy;
     }
 }
 
diff --git a/src/testdir/test_feedkeys.vim b/src/testdir/test_feedkeys.vim
index 33cd589..726538a 100644
--- a/src/testdir/test_feedkeys.vim
+++ b/src/testdir/test_feedkeys.vim
@@ -6,5 +6,7 @@ func Test_feedkeys_x_with_empty_string()
   call assert_equal('', getline('.'))
   call feedkeys('', 'x')
   call assert_equal('foo', getline('.'))
+  call feedkeys('i', 'x')
+  call assert_equal('foo', getline('.'))
   quit!
 endfunc