diff --git a/init.lua b/init.lua
index 72321705..26fb20ff 100644
--- a/init.lua
+++ b/init.lua
@@ -817,7 +817,6 @@ require('lazy').setup {
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
   --    For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
   { import = 'custom.plugins' },
-  vim.keymap.set('n', '<C-b>', ':Neotree toggle last<CR>', { noremap = true, silent = true, desc = 'Toggle neotree' }),
 }
 
 -- The line beneath this is called `modeline`. See `:help modeline`
diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua
index bec15faa..b2ba8977 100644
--- a/lua/custom/plugins/filetree.lua
+++ b/lua/custom/plugins/filetree.lua
@@ -12,4 +12,5 @@ return {
   config = function()
     require('neo-tree').setup {}
   end,
+  vim.keymap.set('n', '<C-b>', ':Neotree toggle last<CR>', { noremap = true, silent = true, desc = 'Toggle neotree' }),
 }
diff --git a/lua/custom/plugins/lazygit.lua b/lua/custom/plugins/lazygit.lua
new file mode 100644
index 00000000..39ed2bf3
--- /dev/null
+++ b/lua/custom/plugins/lazygit.lua
@@ -0,0 +1,17 @@
+return {
+  {
+    'kdheepak/lazygit.nvim',
+    cmd = {
+      'LazyGit',
+      'LazyGitConfig',
+      'LazyGitCurrentFile',
+      'LazyGitFilter',
+      'LazyGitFilterCurrentFile',
+    },
+    -- optional for floating window border decoration
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+    },
+  },
+  vim.keymap.set('n', '<leader>lg', ':LazyGit<CR>', { desc = '[L]azy [G]it' }),
+}
diff --git a/lua/custom/plugins/neotest.lua b/lua/custom/plugins/neotest.lua
index ef5a1dcf..a8a78795 100644
--- a/lua/custom/plugins/neotest.lua
+++ b/lua/custom/plugins/neotest.lua
@@ -15,5 +15,6 @@ return {
       },
     }
   end,
-  vim.keymap.set('n', 'ts', ':Neotest run suite=true<CR> :Neotest summary open<CR>', {}),
+  vim.keymap.set('n', 'tt', ':Neotest summary toggle<CR>', { desc = '[T]oggle [T]est explorer' }),
+  vim.keymap.set('n', 'ts', ':Neotest run suite=true<CR>', { desc = '[T]est [S]uite' }),
 }