diff --git a/detailsBody.html b/detailsBody.html
index 178d4416..303db55a 100644
--- a/detailsBody.html
+++ b/detailsBody.html
@@ -18,7 +18,7 @@
   <i class="fa fa-globe" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('website') }}:</span>
   <span class='value'>
-    <a target='_blank' href='{{ tags.website }}'>{{ tags.website }}</a>
+    <a target='_blank' href='{{ tags.website|websiteUrl }}'>{{ tags.website }}</a>
   </span>
 </li>
 {% endif %}
@@ -28,7 +28,7 @@
   <i class="fa fa-globe" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('website') }}:</span>
   <span class='value'>
-    <a target='_blank' href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+    <a target='_blank' href='{{ attribute(tags, 'contact:website')|websiteUrl }}'>{{ attribute(tags, 'contact:website') }}</a>
   </span>
 </li>
 {% endif %}
diff --git a/popupBody.html b/popupBody.html
index 5a8bd020..c5e9e9e7 100644
--- a/popupBody.html
+++ b/popupBody.html
@@ -18,7 +18,7 @@
   <i class="fa fa-globe" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('website') }}:</span>
   <span class='value'>
-    <a target='_blank' href='{{ tags.website }}'>{{ tags.website }}</a>
+    <a target='_blank' href='{{ tags.website|websiteUrl }}'>{{ tags.website }}</a>
   </span>
 </li>
 {% endif %}
@@ -28,7 +28,7 @@
   <i class="fa fa-globe" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('website') }}:</span>
   <span class='value'>
-    <a target='_blank' href='{{ attribute(tags, 'contact:website') }}'>{{ attribute(tags, 'contact:website') }}</a>
+    <a target='_blank' href='{{ attribute(tags, 'contact:website')|websiteUrl }}'>{{ attribute(tags, 'contact:website') }}</a>
   </span>
 </li>
 {% endif %}