diff --git a/lisp/help.el b/lisp/help.el
index 5911ec205fd26bbfddf6f8056557ca0b7376e603..8a10d194ef6746d2b7571bd7ed4bf57bc7f7404e 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -628,7 +628,12 @@ C-w Display information on absence of warranty for GNU Emacs."
 	  (with-current-buffer "*Help*"
 	    (save-excursion
 	      (re-search-backward "`\\([^`']+\\)'" nil t)
-	      (help-xref-button 1 #'find-function function)))))
+	      (help-xref-button 1 #'(lambda (arg)
+				      (let ((location
+					     (find-function-noselect arg)))
+					(display-buffer (nth 0 location))
+					(goto-char (nth 1 location))))
+				function)))))
     (if need-close (princ ")"))
     (princ ".")
     (terpri)