diff --git a/src/nvim/autocmd.c b/src/nvim/autocmd.c
index 1246b2fc5c..d795dd2aa7 100644
--- a/src/nvim/autocmd.c
+++ b/src/nvim/autocmd.c
@@ -1050,9 +1050,10 @@ int autocmd_register(int64_t id, event_T event, const char *pat, int patlen, int
       get_mode(last_mode);
     }
 
-    // If the event is CursorMoved, update the last cursor position
+    // If the event is CursorMoved or CursorMovedI, update the last cursor position
     // position to avoid immediately triggering the autocommand
-    if (event == EVENT_CURSORMOVED && !has_event(EVENT_CURSORMOVED)) {
+    if ((event == EVENT_CURSORMOVED && !has_event(EVENT_CURSORMOVED))
+        || (event == EVENT_CURSORMOVEDI && !has_event(EVENT_CURSORMOVEDI))) {
       last_cursormoved_win = curwin;
       last_cursormoved = curwin->w_cursor;
     }
diff --git a/test/functional/autocmd/cursormoved_spec.lua b/test/functional/autocmd/cursormoved_spec.lua
index 2cf02e00f3..7cc3a26bfb 100644
--- a/test/functional/autocmd/cursormoved_spec.lua
+++ b/test/functional/autocmd/cursormoved_spec.lua
@@ -7,6 +7,7 @@ local eval = n.eval
 local api = n.api
 local source = n.source
 local command = n.command
+local feed = n.feed
 
 describe('CursorMoved', function()
   before_each(clear)
@@ -49,11 +50,34 @@ describe('CursorMoved', function()
   end)
 
   it('is not triggered by cursor movement prior to first CursorMoved instantiation', function()
+    eq({}, api.nvim_get_autocmds({ event = 'CursorMoved' }))
+    feed('ifoobar<Esc>')
     source([[
       let g:cursormoved = 0
-      autocmd! CursorMoved
       autocmd CursorMoved * let g:cursormoved += 1
     ]])
     eq(0, eval('g:cursormoved'))
+    feed('<Ignore>')
+    eq(0, eval('g:cursormoved'))
+    feed('0')
+    eq(1, eval('g:cursormoved'))
+  end)
+end)
+
+describe('CursorMovedI', function()
+  before_each(clear)
+
+  it('is not triggered by cursor movement prior to first CursorMovedI instantiation', function()
+    eq({}, api.nvim_get_autocmds({ event = 'CursorMovedI' }))
+    feed('ifoobar')
+    source([[
+      let g:cursormovedi = 0
+      autocmd CursorMovedI * let g:cursormovedi += 1
+    ]])
+    eq(0, eval('g:cursormovedi'))
+    feed('<Ignore>')
+    eq(0, eval('g:cursormovedi'))
+    feed('<Home>')
+    eq(1, eval('g:cursormovedi'))
   end)
 end)