diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 894cc623e..5089a24f9 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -30,12 +30,10 @@
   (add-hook 'evil-org-mode-hook #'evil-normalize-keymaps)
   :config
   ;; in case it is called later
-  (advice-add #'evil-org-set-key-theme :after #'+org|setup-evil))
-
-(def-package! evil-org-agenda
-  :when (featurep! :feature evil +everywhere)
-  :after org-agenda
-  :config (evil-org-agenda-set-keys))
+  (advice-add #'evil-org-set-key-theme :after #'+org|setup-evil)
+  (def-package! evil-org-agenda
+    :after org-agenda
+    :config (evil-org-agenda-set-keys)))
 
 
 ;;