diff --git a/dots/.config/nvim/lua/plugins/configs/alpha.lua b/dots/.config/nvim/lua/plugins/configs/alpha.lua
index 0ad476aa..be897af1 100644
--- a/dots/.config/nvim/lua/plugins/configs/alpha.lua
+++ b/dots/.config/nvim/lua/plugins/configs/alpha.lua
@@ -2,6 +2,19 @@ return {
     {
         "goolord/alpha-nvim",
         dependencies = { "nvim-tree/nvim-web-devicons" },
+        init = function()
+            vim.api.nvim_create_autocmd("BufEnter", {
+                once = true,
+                callback = function()
+                    local f = vim.fn.expand("%:p")
+                    if vim.fn.isdirectory(f) == 0 then
+                        require("alpha")
+                        return true
+                    end
+                end,
+            })
+        end,
+        lazy = true,
         opts = function()
             -- Set header
             local header = {
diff --git a/dots/.config/nvim/lua/plugins/configs/neo-tree.lua b/dots/.config/nvim/lua/plugins/configs/neo-tree.lua
index 3a384f8f..be1f926e 100644
--- a/dots/.config/nvim/lua/plugins/configs/neo-tree.lua
+++ b/dots/.config/nvim/lua/plugins/configs/neo-tree.lua
@@ -15,12 +15,11 @@ return {
             -- Correctly hijack netrw, thanks to
             -- https://github.com/nvim-neo-tree/neo-tree.nvim/issues/1247#issuecomment-1836294271
             vim.api.nvim_create_autocmd("BufEnter", {
-                group = vim.api.nvim_create_augroup("NeoTreeInit", { clear = true }),
+                once = true,
                 callback = function()
                     local f = vim.fn.expand("%:p")
-                    if vim.fn.isdirectory(f) ~= 0 then
+                    if vim.fn.isdirectory(f) == 1 then
                         require("neo-tree")
-                        -- neo-tree is loaded now, delete the init autocmd
                         return true
                     end
                 end,
diff --git a/dots/.config/nvim/lua/plugins/configs/treesitter.lua b/dots/.config/nvim/lua/plugins/configs/treesitter.lua
index 94dbc2ac..a3833d93 100644
--- a/dots/.config/nvim/lua/plugins/configs/treesitter.lua
+++ b/dots/.config/nvim/lua/plugins/configs/treesitter.lua
@@ -122,15 +122,11 @@ return {
             "RRethy/nvim-treesitter-endwise",
         },
         init = function()
-            vim.api.nvim_create_autocmd("BufEnter", {
-                group = vim.api.nvim_create_augroup("NeoTreeInit", { clear = true }),
+            vim.api.nvim_create_autocmd("FileReadPre", {
+                once = true,
                 callback = function()
-                    local f = vim.fn.expand("%:p")
-                    if vim.fn.isdirectory(f) == 0 then
-                        require("neo-tree")
-                        -- neo-tree is loaded now, delete the init autocmd
-                        return true
-                    end
+                    require("nvim-treesitter")
+                    return true
                 end,
             })
         end,