diff --git a/init.lua b/init.lua
index 2c613bf5..033c2c2f 100644
--- a/init.lua
+++ b/init.lua
@@ -165,7 +165,7 @@ vim.opt.scrolloff = 10
 vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
 
 -- Diagnostic keymaps
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
+vim.keymap.set('n', '<leader>xq', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
 
 -- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier
 -- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
diff --git a/lua/custom/plugins/barbar.lua b/lua/custom/plugins/barbar.lua
index a0ae8e9a..bf5a1eaa 100644
--- a/lua/custom/plugins/barbar.lua
+++ b/lua/custom/plugins/barbar.lua
@@ -21,5 +21,6 @@ return {
     vim.keymap.set('n', '<S-Tab>', '<Cmd>BufferPrevious<CR>', { noremap = true, silent = true, desc = 'Move to previous buffer' })
 
     vim.keymap.set('n', '<leader>bc', '<Cmd>BufferClose<CR>', { noremap = true, silent = true, desc = 'Close current buffer' })
+    vim.keymap.set('n', '<leader>q', '<Cmd>BufferClose<CR>', { noremap = true, silent = true, desc = 'Close current buffer' })
   end,
 }