diff --git a/lua/astrocommunity/diagnostics/trouble-nvim/README.md b/lua/astrocommunity/diagnostics/trouble-nvim/README.md
index 06a002f7f..27aaf096f 100644
--- a/lua/astrocommunity/diagnostics/trouble-nvim/README.md
+++ b/lua/astrocommunity/diagnostics/trouble-nvim/README.md
@@ -3,3 +3,5 @@
 🚦 A pretty diagnostics, references, telescope results, quickfix and location list to help you solve all the trouble your code is causing.
 
 **Repository:** <https://github.com/folke/trouble.nvim>
+
+_Note_: This plugin will also configure mappings to enable integration with `todo-comments.nvim` if it's being imported and enabled another place.
diff --git a/lua/astrocommunity/diagnostics/trouble-nvim/init.lua b/lua/astrocommunity/diagnostics/trouble-nvim/init.lua
index 956b95715..8cb4f96ea 100644
--- a/lua/astrocommunity/diagnostics/trouble-nvim/init.lua
+++ b/lua/astrocommunity/diagnostics/trouble-nvim/init.lua
@@ -16,6 +16,16 @@ return {
             { "<Cmd>TroubleToggle document_diagnostics<CR>", desc = "Document Diagnostics (Trouble)" }
           maps.n[prefix .. "l"] = { "<Cmd>TroubleToggle loclist<CR>", desc = "Location List (Trouble)" }
           maps.n[prefix .. "q"] = { "<Cmd>TroubleToggle quickfix<CR>", desc = "Quickfix List (Trouble)" }
+          if require("astrocore").is_available "todo-comments.nvim" then
+            maps.n["<leader>xt"] = {
+              "<cmd>TodoTrouble<cr>",
+              desc = "Todo (Trouble)",
+            }
+            maps.n["<leader>xT"] = {
+              "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>",
+              desc = "Todo/Fix/Fixme (Trouble)",
+            }
+          end
         end,
       },
     },