diff --git a/css/gui/tooltips/tippy.css b/css/gui/tooltips/tippy.css
index 0025e60e0503ff55ccc7f55dbe171352cc5ddb24..666b85948865439d0447b0270d0322879000a552 100644
--- a/css/gui/tooltips/tippy.css
+++ b/css/gui/tooltips/tippy.css
@@ -3,6 +3,14 @@
 	white-space: nowrap;
 }
 
+/* Fix links */
+a.has-tooltip {
+	text-decoration: none;
+}
+a.has-tooltip:hover {
+	text-decoration: underline;
+}
+
 .tippy-content {
 	text-indent: initial;
 	font-weight: initial;
diff --git a/src/js/utilsDOM.js b/src/js/utilsDOM.js
index 9c8b0a10ab35aac4bfe32206f0f371f151a3ab2f..27dc32ec846e18b806b890b087fffc514e23c3c7 100644
--- a/src/js/utilsDOM.js
+++ b/src/js/utilsDOM.js
@@ -87,6 +87,7 @@ App.UI.DOM.link = function(linkText, handler, args = [], passage = "", tooltip =
 	};
 
 	if (tooltip) {
+		link.classList.add("has-tooltip");
 		tippy(link, {
 			content: tooltip,
 		});