diff --git a/init.el b/init.el
index 16521e1..c8893cf 100644
--- a/init.el
+++ b/init.el
@@ -174,7 +174,9 @@
 (use-package appt
   :custom
   (appt-display-diary nil)
-  (appt-display-format 'echo))
+  (appt-display-format 'echo)
+  (appt-display-interval 10)
+  (appt-message-warning-time 20))
 
 (use-package calendar
   :bind (("C-c >" . calendar))
@@ -692,8 +694,7 @@
 (use-package org-agenda
   :after org
   :bind (("C-c a" . org-agenda))
-  :hook ((org-agenda-mode . (lambda () (visual-line-mode -1)))
-         (org-agenda-finalize . org-agenda-to-appt))
+  :hook ((org-agenda-mode . (lambda () (visual-line-mode -1))))
   :custom
   (org-agenda-span 'week)
   (org-agenda-start-on-weekday 1)
@@ -721,8 +722,11 @@
   (require 'org-journal)
   (add-to-list 'org-agenda-files (expand-file-name org-journal-dir))
   (khalel-import-events)
+  (advice-add 'appt-check
+              :before
+              (lambda (&rest args)
+                (org-agenda-to-appt t)))
   (appt-activate +1)
-  (org-agenda-to-appt)
   (setq org-agenda-custom-commands
         '(("p" "Personal Agenda" tags "+personal")
           ("w" "Work Agenda" tags "+work"))))