diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 58e780bd7b..99f6d76f05 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1258,11 +1258,11 @@ function renderTags(page, item) {
     }
 
     for (let i = 0, length = tags.length; i < length; i++) {
-        tagElements.push(tags[i]);
+        tagElements.push('<a href="#/search.html?query=' + encodeURIComponent(tags[i]) + '" class="button-link emby-button" is="emby-linkbutton">' + tags[i] + '</a>');
     }
 
     if (tagElements.length) {
-        itemTags.innerText = globalize.translate('TagsValue', tagElements.join(', '));
+        itemTags.innerHTML = globalize.translate('TagsValue', tagElements.join(', '));
         itemTags.classList.remove('hide');
     } else {
         itemTags.innerHTML = '';