diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index b8712f5..06421ee 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -24,7 +24,7 @@ return {
       require("trouble").setup()
     end,
   },
-  "folke/which-key.nvim",
+  { "folke/which-key.nvim", lazy = false },
   {
     "j-hui/fidget.nvim",
     config = function()
diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua
index d9029ff..fc16ddc 100644
--- a/lua/plugins/neogit.lua
+++ b/lua/plugins/neogit.lua
@@ -2,17 +2,20 @@ return {
   "TimUntersberger/neogit",
   cmd = "Neogit",
   dependencies = { "sindrets/diffview.nvim" },
+  keys = {
+    { "<leader>ng", "<cmd>Neogit<cr>", desc = "Neogit" },
+  },
   config = function()
     require("neogit").setup({
       integrations = {
         diffview = true,
       },
     })
-    vim.api.nvim_set_keymap(
-      "n",
-      "<leader>ng",
-      [[<cmd>lua require('neogit').open({ kind = "split" })<cr>]],
-      { noremap = true, silent = true }
-    )
+    local group = vim.api.nvim_create_augroup("MyCustomNeogitEvents", { clear = true })
+    vim.api.nvim_create_autocmd("User", {
+      pattern = "NeogitPushComplete",
+      group = group,
+      callback = require("neogit").close,
+    })
   end,
 }