diff --git a/site-modules/core/files/emacs/init.el b/site-modules/core/files/emacs/init.el
index c2eb510..8e0dee8 100644
--- a/site-modules/core/files/emacs/init.el
+++ b/site-modules/core/files/emacs/init.el
@@ -299,12 +299,21 @@ just in in the current buffer."
 
 (use-package evil-org
   :straight t
-  :after org
+  :after evil org
   :hook (org-mode . (lambda () evil-org-mode))
   :config
   (require 'evil-org-agenda)
+  (evil-org-set-key-theme)
   (evil-org-agenda-set-keys))
 
+;; Ensure org-agenda starts in evil-normal-state
+(defun aa/org-agenda-setup ()
+  "Start org-agenda in evil-normal-state."
+  (evil-org-mode)
+  (evil-set-initial-state 'org-agenda-mode 'normal))
+
+(add-hook 'org-agenda-mode-hook 'aa/org-agenda-setup)
+
 ;;; Email
 
 (use-package counsel-notmuch