diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index a8188ffef..4ef79f388 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -751,17 +751,18 @@ between the two."
         :map org-agenda-mode-map
         :m "C-SPC" #'org-agenda-show-and-scroll-up
         :localleader
-        "d" #'org-agenda-deadline
+        (:prefix ("d" . "date/deadline")
+         "d" #'org-agenda-deadline
+         "s" #'org-agenda-schedule)
         (:prefix ("c" . "clock")
-         "c" #'org-agenda-clock-in
-         "C" #'org-agenda-clock-out
+         "c" #'org-agenda-clock-cancel
          "g" #'org-agenda-clock-goto
+         "i" #'org-agenda-clock-in
+         "o" #'org-agenda-clock-out
          "r" #'org-agenda-clockreport-mode
-         "s" #'org-agenda-show-clocking-issues
-         "x" #'org-agenda-clock-cancel)
+         "s" #'org-agenda-show-clocking-issues)
         "q" #'org-agenda-set-tags
         "r" #'org-agenda-refile
-        "s" #'org-agenda-schedule
         "t" #'org-agenda-todo))