diff --git a/lua/lazyvim/config/autocmds.lua b/lua/lazyvim/config/autocmds.lua
index 7d9feedd..e2828726 100644
--- a/lua/lazyvim/config/autocmds.lua
+++ b/lua/lazyvim/config/autocmds.lua
@@ -32,6 +32,9 @@ vim.api.nvim_create_autocmd({ "VimResized" }, {
 vim.api.nvim_create_autocmd("BufReadPost", {
   group = augroup("last_loc"),
   callback = function(event)
+    if event.data and event.data.lazy_file then
+      return
+    end
     local exclude = { "gitcommit" }
     local buf = event.buf
     if vim.tbl_contains(exclude, vim.bo[buf].filetype) then
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index feed2dff..119d8b4c 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -168,9 +168,10 @@ function M.lazy_file()
         pattern = event.pattern,
         modeline = false,
         buffer = event.buf,
-        data = event.data,
+        data = { lazy_file = true },
       })
     end
+    vim.api.nvim_exec_autocmds("CursorMoved", { modeline = false })
     events = {}
   end