diff --git a/config/nvim/lua/autogroups.lua b/config/nvim/lua/autogroups.lua
index add83eb..a1e8867 100644
--- a/config/nvim/lua/autogroups.lua
+++ b/config/nvim/lua/autogroups.lua
@@ -104,4 +104,8 @@ autocmd({ 'BufRead', 'BufNewFile' }, {
   command = 'set filetype=sshconfig',
 })
 
+autocmd('QuickFixCmdPost', {
+  callback = function() vim.cmd [[Trouble qflist open]] end,
+})
+
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/config/nvim/lua/plugins/folke.lua b/config/nvim/lua/plugins/folke.lua
index 851fdfa..076b2e7 100644
--- a/config/nvim/lua/plugins/folke.lua
+++ b/config/nvim/lua/plugins/folke.lua
@@ -50,6 +50,37 @@ return {
       auto_fold = true,
       auto_close = true,
       use_lsp_diagnostic_signs = true,
+      keys = {
+        j = 'next',
+        k = 'prev',
+      },
+      modes = {
+        diagnostics = {
+          auto_open = true,
+        },
+        test = {
+          mode = 'diagnostics',
+          preview = {
+            type = 'split',
+            relative = 'win',
+            position = 'right',
+            size = 0.3,
+          },
+        },
+        cascade = {
+          mode = 'diagnostics', -- inherit from diagnostics mode
+          filter = function(items)
+            local severity = vim.diagnostic.severity.HINT
+            for _, item in ipairs(items) do
+              severity = math.min(severity, item.severity)
+            end
+            return vim.tbl_filter(
+              function(item) return item.severity == severity end,
+              items
+            )
+          end,
+        },
+      },
     },
   },
 
diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
index bf6550a..d92d5f8 100644
--- a/config/nvim/lua/plugins/telescope.lua
+++ b/config/nvim/lua/plugins/telescope.lua
@@ -36,6 +36,9 @@ return {
     local t = require 'telescope'
     local a = require 'telescope.actions'
 
+    local open_with_trouble = require('trouble.sources.telescope').open
+    local add_to_trouble = require('trouble.sources.telescope').add
+
     -- [[ Configure Telescope ]]
     -- See `:help telescope` and `:help telescope.setup()`
     t.setup {
@@ -52,6 +55,12 @@ return {
             ['<C-j>'] = a.move_selection_next,
             ['<C-k>'] = a.move_selection_previous,
             ['<C-d>'] = a.move_selection_previous,
+            ['<C-t>'] = open_with_trouble,
+            ['<C-q>'] = add_to_trouble,
+          },
+          n = {
+            ['<C-t>'] = open_with_trouble,
+            ['<C-q>'] = add_to_trouble,
           },
         },
       },