diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index c7319c96f9..c4b153dc04 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -871,6 +871,11 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear
 
   state_enter(&s->state);
 
+  // Trigger CmdlineLeavePre autocommands if not already triggered.
+  if (!s->event_cmdlineleavepre_triggered) {
+    trigger_cmd_autocmd(s->cmdline_type, EVENT_CMDLINELEAVEPRE);
+  }
+
   if (has_event(EVENT_CMDLINELEAVE)) {
     save_v_event_T save_v_event;
     dict_T *dict = get_v_event(&save_v_event);
@@ -950,11 +955,6 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear
     need_wait_return = false;
   }
 
-  // Trigger CmdlineLeavePre autocommands if not already triggered.
-  if (!s->event_cmdlineleavepre_triggered) {
-    trigger_cmd_autocmd(s->cmdline_type, EVENT_CMDLINELEAVEPRE);
-  }
-
   set_option_direct(kOptInccommand, CSTR_AS_OPTVAL(s->save_p_icm), 0, SID_NONE);
   State = s->save_State;
   if (cmdpreview != save_cmdpreview) {
diff --git a/test/old/testdir/test_autocmd.vim b/test/old/testdir/test_autocmd.vim
index 17fde49840..484b6c641f 100644
--- a/test/old/testdir/test_autocmd.vim
+++ b/test/old/testdir/test_autocmd.vim
@@ -1987,11 +1987,28 @@ func Test_Cmdline_Trigger()
   call assert_equal('CmdlineLeavePre', g:log)
   call assert_equal('CmdlineLeave', g:log2)
 
-  let g:count = 0
-  autocmd CmdlineLeavePre * let g:count += 1
-  call feedkeys(":let c = input('? ')\<cr>B\<cr>", "tx")
-  call assert_equal(2, g:count)
-  unlet! g:count
+  autocmd CmdlineLeavePre * let g:cmdline += [getcmdline()]
+
+  for end_keys in ["\<CR>", "\<NL>", "\<kEnter>", "\<C-C>", "\<Esc>",
+                 \ "\<C-\>\<C-N>", "\<C-\>\<C-G>"]
+    let g:cmdline = []
+    let g:log = ''
+    let g:log2 = ''
+    call assert_equal('', g:log)
+    let keys = $':echo "hello"{end_keys}'
+    let msg = keytrans(keys)
+    call feedkeys(keys, "tx")
+    call assert_equal(['echo "hello"'], g:cmdline, msg)
+    call assert_equal('CmdlineLeavePre', g:log, msg)
+    call assert_equal('CmdlineLeave', g:log2, msg)
+  endfor
+
+  let g:cmdline = []
+  call feedkeys(":let c = input('? ')\<cr>ABCDE\<cr>", "tx")
+  call assert_equal(["let c = input('? ')", 'ABCDE'], g:cmdline)
+
+  au! CmdlineLeavePre
+  unlet! g:cmdline
   unlet! g:log
   unlet! g:log2
   bw!