diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index bf7c08b2c..9d85c9a7b 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -249,6 +249,7 @@ between the two."
         "T" #'org-todo-list
         "l" #'org-insert-link
         "L" #'org-store-link
+        "q" #'org-set-tags
         "r" #'org-refile
         "s" #'org-schedule
         "'" #'org-edit-special
@@ -303,8 +304,15 @@ between the two."
             "c" #'org-table-create
             "r" #'org-table-recalculate
             "e" #'org-table-edit-formulas
-            "=" #'org-table-eval-formulas))))
+            "=" #'org-table-eval-formulas)))
 
+  (map! :map org-agenda-mode-map
+        :localleader
+        "d" #'org-agenda-deadline
+        "q" #'org-agenda-set-tags
+        "r" #'org-agenda-refile
+        "s" #'org-agenda-schedule
+        "t" #'org-agenda-todo))
 
 (defun +org|setup-evil-keybinds (&rest args)
   (unless args ; lookout for recursive requires