diff --git a/lisp/org.el b/lisp/org.el
index c6bd70216..2c841ab53 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10208,7 +10208,7 @@ a link."
 	     (org-element-context)
 	     '(clock comment comment-block footnote-definition
 		     footnote-reference headline inline-src-block inlinetask
-		     keyword link node-property src-block timestamp)
+		     keyword link node-property planning src-block timestamp)
 	     t))
 	   (type (org-element-type context))
 	   (value (org-element-property :value context)))
@@ -10251,6 +10251,10 @@ a link."
 		       (= (org-element-property :post-affiliated context)
 			  (line-beginning-position)))))))
 	(org-footnote-action))
+       ;; On a planning line.  Check if we are really on a timestamp.
+       ((and (eq type 'planning)
+	     (org-in-regexp org-ts-regexp-both nil t))
+	(org-follow-timestamp-link))
        ;; On a clock line, make sure point is on the timestamp
        ;; before opening it.
        ((and (eq type 'clock)