--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -894,7 +918,13 @@ defun shr-urlify (start url &optional title)
   (add-text-properties
    start (point)
    (list 'shr-url url
-	 'help-echo (if title (shr-fold-text (format "%s (%s)" url title)) url)
+	 'help-echo (let ((iri (or (with-demoted-errors
+				       "shr-urlify: %s"
+				     (decode-coding-string
+				      (url-unhex-string url)
+				      'utf-8 t))
+				   url)))
+		      (if title (format "%s (%s)" iri title) iri))
 	 'follow-link t
 	 'mouse-face 'highlight
 	 'keymap shr-map)))