diff --git a/init.lua b/init.lua
index 8807daa..939f6c6 100644
--- a/init.lua
+++ b/init.lua
@@ -53,8 +53,13 @@ require('lazy').setup({
 		'folke/which-key.nvim',
 		event = 'VeryLazy',
 		opts = {
+			sort = { 'manual', 'group', 'mod' },
 			spec = {
-				{ '<leader>q', group = 'Quit' },
+				{ '<leader>q', group = 'q' },
+				{ '<leader>qq', desc = 'Close' },
+				{ '<leader>qy', desc = 'Save & close' },
+				{ '<leader>qn', desc = 'Discard changes & close' },
+				{ '<leader>qa', desc = 'Quit Neovim' },
 			},
 		},
 		config = function(_, opts)
diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index f8a9f5b..2b4b89d 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -447,13 +447,16 @@ end
 -- Keymaps
 vim.keymap.set('n', '<leader>q', function()
 	close_window()
-end, { desc = 'Close window' })
+end, { desc = 'Close' })
+vim.keymap.set('n', '<leader>qq', function()
+	close_window()
+end, { desc = 'Close' })
 vim.keymap.set('n', '<leader>qy', function()
 	close_window 'save'
-end, { desc = 'Save & quit current window' })
+end, { desc = 'Save & close' })
 vim.keymap.set('n', '<leader>qn', function()
 	close_window 'discard'
-end, { desc = 'Discard changes in current window & quit' })
+end, { desc = 'Discard changes & close' })
 
 -- [[ Close Neovim ]]
 -- Function to close Neovim, discarding all unsaved changes if confirmed