diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el
index 7c223dc2f..53f9afc37 100644
--- a/modules/lang/org/autoload/org.el
+++ b/modules/lang/org/autoload/org.el
@@ -38,7 +38,8 @@ If on a:
 - checkbox list item or todo heading: toggle it.
 - clock: update its time.
 - headline: toggle latex fragments and inline images underneath.
-- footnote definition: jump to the footnote
+- footnote reference: jump to the footnote's definition
+- footnote definition: jump to the first reference of this footnote
 - table-row or a TBLFM: recalculate the table's formulas
 - table-cell: clear it and go into insert mode. If this is a formula cell,
   recaluclate it instead.
@@ -73,9 +74,11 @@ If on a:
 
       (`clock (org-clock-update-time-maybe))
 
+      (`footnote-reference
+       (org-footnote-goto-definition (org-element-property :label context)))
+
       (`footnote-definition
-       (goto-char (org-element-property :post-affiliated context))
-       (call-interactively #'org-footnote-action))
+       (org-footnote-goto-previous-reference (org-element-property :label context)))
 
       ((or `planning `timestamp)
        (org-follow-timestamp-link))