diff --git a/nvim/.config/nvim/lua/plugins/ide.lua b/nvim/.config/nvim/lua/plugins/ide.lua
index c13ff31..21dec00 100644
--- a/nvim/.config/nvim/lua/plugins/ide.lua
+++ b/nvim/.config/nvim/lua/plugins/ide.lua
@@ -235,13 +235,10 @@ return {
 		opts = {},
 		cmd = {
 			"Trouble",
-			"TroubleRefresh",
-			"TroubleToggle",
-			"TroubleClose",
 		},
 		keys = {
-			{ "<leader>sd", "<cmd>Trouble workspace_diagnostics<cr>", silent = true, desc = "diagnostics workspace" },
-			{ "<leader>sD", "<cmd>Trouble document_diagnostics<cr>", silent = true, desc = "diagnostics document" },
+			{ "<leader>sd", "<cmd>Trouble diagnostics toggle<cr>", silent = true, desc = "diagnostics workspace" },
+			{ "<leader>sD", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>", silent = true, desc = "diagnostics document" },
 		},
 	},
 
diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua
index 08fa63c..a32bf82 100644
--- a/nvim/.config/nvim/lua/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
@@ -36,6 +36,11 @@ return {
 					prompt_prefix = "󰍉 ",
 					selection_caret = "󰳟 ",
 					color_devicons = true,
+					mappings = {
+					    -- FIXME Find way to only invoke this *IF* trouble plugin is found
+					    i = { ["<c-t>"] = require("trouble.sources.telescope").open },
+					    n = { ["<c-t>"] = require("trouble.sources.telescope").open },
+					}
 				},
 				pickers = {
 					buffers = { theme = "ivy" },