diff --git a/emacs/init.el b/emacs/init.el
index fde8f10..512dc06 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -733,6 +733,8 @@ EMACS-ALTERNATIVE is the Emacs equivalent (e.g., 'C-s')."
          ("C-j" . nil)
          ("C-a" . mwim-beginning)
          ("C-e" . mwim-end)
+         :map org-agenda-mode-map
+         ("C-x C-s" . org-save-all-org-buffers)
          :map org-src-mode-map
          ("C-c C-c" . org-edit-src-exit))
   :hook ((org-mode . visual-line-mode))
@@ -756,7 +758,7 @@ EMACS-ALTERNATIVE is the Emacs equivalent (e.g., 'C-s')."
     (interactive)
     (org-agenda nil "d"))
 
-  (add-hook 'org-after-todo-state-change-hook #'save-buffer))
+  (add-hook 'org-after-todo-state-change-hook #'org-save-all-org-buffers))
 
 
 (use-package org-bullets