diff --git a/src/invidious/helpers/utils.cr b/src/invidious/helpers/utils.cr
index 7a262f849..ad4b65324 100644
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@@ -404,3 +404,13 @@ def invidious_companion_encrypt(data)
   encrypted_data = encrypt_ecb_without_salt("#{timestamp}|#{data}", CONFIG.invidious_companion_key)
   return Base64.urlsafe_encode(encrypted_data)
 end
+
+# Parses hashtags (#tag) in a text string and wraps them in clickable links.
+# The input text should already be HTML-escaped. The hashtag text is kept as-is
+# (including the # symbol) within the link, while the URL uses the encoded tag name.
+def parse_hashtags_in_text(text : String) : String
+  text.gsub(/#([\w-]+)/) do |_match|
+    hashtag = $1
+    %(<a href="/hashtag/#{URI.encode_www_form(hashtag, space_to_plus: false)}">##{hashtag}</a>)
+  end
+end
diff --git a/src/invidious/views/components/item.ecr b/src/invidious/views/components/item.ecr
index ece2efe8a..61545e593 100644
--- a/src/invidious/views/components/item.ecr
+++ b/src/invidious/views/components/item.ecr
@@ -78,7 +78,7 @@
             </div>
 
             <div class="video-card-row">
-                <a href="<%= link_url %>"><p dir="auto"><%= HTML.escape(item.title) %></p></a>
+                <a href="<%= link_url %>"><p dir="auto"><%= parse_hashtags_in_text(HTML.escape(item.title)) %></p></a>
             </div>
 
             <div class="video-card-row flexible">
@@ -176,7 +176,7 @@
             </div>
 
             <div class="video-card-row">
-                <a href="<%= link_url %>"><p dir="auto"><%= HTML.escape(item.title) %></p></a>
+                <a href="<%= link_url %>"><p dir="auto"><%= parse_hashtags_in_text(HTML.escape(item.title)) %></p></a>
             </div>
 
             <div class="video-card-row flexible">
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index 796c0c914..12ae4ba52 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -1,5 +1,5 @@
 <% ucid = video.ucid %>
-<% title = HTML.escape(video.title) %>
+<% title = parse_hashtags_in_text(HTML.escape(video.title)) %>
 <% author = HTML.escape(video.author) %>
 
 
@@ -341,7 +341,7 @@ we're going to need to do it here in order to allow for translations.
                             </div>
 
                             <div class="video-card-row">
-                                <a href="/watch?v=<%= rv["id"] %>&listen=<%= params.listen %>"><p dir="auto"><%= HTML.escape(rv["title"]) %></p></a>
+                                <a href="/watch?v=<%= rv["id"] %>&listen=<%= params.listen %>"><p dir="auto"><%= parse_hashtags_in_text(HTML.escape(rv["title"])) %></p></a>
                             </div>
 
                             <h5 class="pure-g">