diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index 86e895cfa..e583208e6 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -41,6 +41,19 @@ load everything.")
 (def-package! magit-blame :after git-timemachine)
 
 
+(def-package! magit-todos
+  :after magit
+  :config
+  (setq magit-todos-require-colon nil)
+  ;; `magit-todos-mode' defines keybinds on activation, so it's better to just
+  ;; do this manually:
+  (magit-add-section-hook 'magit-status-sections-hook
+                          #'magit-todos--insert-todos
+                          'magit-insert-staged-changes
+                          'append)
+  (define-key magit-todos-section-map "j" nil))
+
+
 (def-package! magithub
   :after magit
   :preface
diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el
index 51682daa9..38bcc3d37 100644
--- a/modules/tools/magit/packages.el
+++ b/modules/tools/magit/packages.el
@@ -4,5 +4,6 @@
 (when (package! magit)
   (package! magit-gitflow)
   (package! magithub)
+  (package! magit-todos)
   (when (featurep! :feature evil +everywhere)
     (package! evil-magit)))