diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index bd8469d28..b39281fb2 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -828,6 +828,7 @@ compelling reason, so..."
 
 (use-package! evil-org
   :when (featurep! :editor evil +everywhere)
+  :after org
   :hook (org-mode . evil-org-mode)
   :init
   (defvar evil-org-retain-visual-state-on-shift t)
@@ -895,6 +896,7 @@ compelling reason, so..."
 
 (use-package! evil-org-agenda
   :when (featurep! :editor evil +everywhere)
+  :after org-agenda
   :hook (org-agenda-mode . evil-org-agenda-mode)
   :config
   (evil-org-agenda-set-keys)