diff --git a/init.lua b/init.lua
index 24adccf4..9180a7da 100644
--- a/init.lua
+++ b/init.lua
@@ -1,10 +1,4 @@
 require("config.options")
 require("config.lazy")
-
-vim.api.nvim_create_autocmd("User", {
-  pattern = "VeryLazy",
-  callback = function()
-    require("config.autocmds")
-    require("config.keymaps")
-  end,
-})
+require("config.autocmds")
+require("config.keymaps")
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 6e64c1f7..88f0d7ee 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -76,8 +76,3 @@ vim.keymap.set("n", "<leader>gg", function()
     },
   })
 end, { desc = "Lazygit" })
-
-require("which-key").register({
-  f = { name = "+file" },
-  g = { name = "+git" },
-}, { prefix = "<leader>" })
diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua
index 63231be8..3dd093a1 100644
--- a/lua/plugins/editor.lua
+++ b/lua/plugins/editor.lua
@@ -33,11 +33,18 @@ return {
   {
     "folke/which-key.nvim",
     event = "VeryLazy",
-    config = {
-      show_help = false,
-      plugins = { spelling = true },
-      key_labels = { ["<leader>"] = "SPC" },
-    },
+    config = function()
+      local wk = require("which-key")
+      wk.setup({
+        show_help = false,
+        plugins = { spelling = true },
+        key_labels = { ["<leader>"] = "SPC" },
+      })
+      wk.register({
+        f = { name = "+file" },
+        g = { name = "+git" },
+      }, { prefix = "<leader>" })
+    end,
   },
 
   -- git signs