diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index a11605ed2e..634145439a 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -174,23 +174,23 @@
 	<div class="px-4 py-2 flex space-x-3 divide-x divide-gray-400 text-xs bg-gray-100 md:border-b md:border-gray-300">
 		<ul class="flex items-center space-x-3 leading-normal mb-0">
 			<li>
-				<a class="{{ 'font-bold text-red-600' if request.path == '@/{{u.username}}' in request.path else 'text-gray-700' }}" href="/@{{u.username}}">
+				<a class="{{ 'font-bold text-red-600' if '@/{{u.username}}' in request.full_path else 'text-gray-700' }}" href="/@{{u.username}}">
 					Posts <span class="text-gray-500 font-normal">{{ u.post_count }}</span>
 				</a>
 			</li>
 			<li>
-				<a class="{{ 'font-bold text-red-600' if request.path == '/comments' else 'text-gray-700' }}" href="/@{{u.username}}/comments">
+				<a class="{{ 'font-bold text-red-600' if '/comments' in request.full_path else 'text-gray-700' }}" href="/@{{u.username}}/comments">
 					Comments <span class="text-gray-500 font-normal">{{ u.comment_count }}</span>
 				</a>
 			</li>
 			{% if u.id == v.id %}
 			<li>
-				<a class="{{ 'font-bold text-red-600' if request.path == '/saved/posts' else 'text-gray-700' }}" href="/@{{u.username}}/saved/posts">
+				<a class="{{ 'font-bold text-red-600' if '/saved/posts' in request.full_path else 'text-gray-700' }}" href="/@{{u.username}}/saved/posts">
 					Saved Posts
 				</a>
 			</li>
 			<li>
-				<a class="{{ 'font-bold text-red-600' if request.path == '/saved/comments' else 'text-gray-700' }}" href="/@{{u.username}}/saved/comments">
+				<a class="{{ 'font-bold text-red-600' if '/saved/comments' in request.full_path else 'text-gray-700' }}" href="/@{{u.username}}/saved/comments">
 					Saved Comments
 				</a>
 			</li>