diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index c07a08a..eb3432d 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -6,7 +6,8 @@
 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' })
+-- NOTE: disabled: use Trouble keybindings instead
+-- vim.keymap.set('n', '<leader>q', 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/plugins/toggleterm.lua b/lua/plugins/toggleterm.lua
index ec65703..339cdbf 100644
--- a/lua/plugins/toggleterm.lua
+++ b/lua/plugins/toggleterm.lua
@@ -14,7 +14,8 @@ return {
         group = vim.api.nvim_create_augroup('kickstart-termopen-setkeymaps', { clear = true }),
         callback = function()
           local opts = { buffer = 0 }
-          vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts) -- <Esc> to exit out of "Terminal" mode
+          -- NOTE: disabled: keymaps.lua has another similar global keybinding for this for all terminals
+          -- vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts) -- <Esc> to exit out of "Terminal" mode
         end,
       })
     end,