diff --git a/config.el b/config.el
index 09e8c01..ff0ccc7 100644
--- a/config.el
+++ b/config.el
@@ -430,6 +430,13 @@ Skip for beamer exports — beamer uses adjustbox on plain tabular."
 (advice-add 'org-agenda-next-line     :after #'my/org-agenda-goto-task-name)
 (advice-add 'org-agenda-previous-line :after #'my/org-agenda-goto-task-name)
 
+;; Also trigger on post-command-hook in agenda buffers (catches Evil j/k,
+;; super-agenda navigation, and any other motion commands)
+(add-hook 'org-agenda-mode-hook
+          (lambda ()
+            (add-hook 'post-command-hook
+                      #'my/org-agenda-goto-task-name nil t)))
+
 ;; Org buffer: snap cursor past TODO keyword/priority on headings in normal state
 (defun my/org-heading-snap-past-keyword ()
   "In Evil normal state, snap cursor past TODO keyword and priority on org headings."