diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 3734d55a5b..9033e00f3d 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -1631,7 +1631,10 @@ end:
     return false;
   }
 
-  ins_char_typebuf(vgetc_char, vgetc_mod_mask);
+  int len = ins_char_typebuf(vgetc_char, vgetc_mod_mask);
+  if (KeyTyped) {
+    ungetchars(len);
+  }
   return true;
 }
 
diff --git a/test/functional/terminal/mouse_spec.lua b/test/functional/terminal/mouse_spec.lua
index 0395d5ee16..08ec7b97cf 100644
--- a/test/functional/terminal/mouse_spec.lua
+++ b/test/functional/terminal/mouse_spec.lua
@@ -41,6 +41,7 @@ describe(':terminal mouse', function()
     end)
 
     it('will exit focus and trigger Normal mode mapping on mouse click', function()
+      feed([[<C-\><C-N>qri]])
       command('let g:got_leftmouse = 0')
       command('nnoremap <LeftMouse> <Cmd>let g:got_leftmouse = 1<CR>')
       eq('t', eval('mode(1)'))
@@ -48,9 +49,12 @@ describe(':terminal mouse', function()
       feed('<LeftMouse>')
       eq('nt', eval('mode(1)'))
       eq(1, eval('g:got_leftmouse'))
+      feed('q')
+      eq('i<LeftMouse>', eval('keytrans(@r)'))
     end)
 
     it('will exit focus and trigger Normal mode mapping on mouse click with modifier', function()
+      feed([[<C-\><C-N>qri]])
       command('let g:got_ctrl_leftmouse = 0')
       command('nnoremap <C-LeftMouse> <Cmd>let g:got_ctrl_leftmouse = 1<CR>')
       eq('t', eval('mode(1)'))
@@ -58,6 +62,8 @@ describe(':terminal mouse', function()
       feed('<C-LeftMouse>')
       eq('nt', eval('mode(1)'))
       eq(1, eval('g:got_ctrl_leftmouse'))
+      feed('q')
+      eq('i<C-LeftMouse>', eval('keytrans(@r)'))
     end)
 
     it('will exit focus on <C-\\> + mouse-scroll', function()