diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index edd8622b36..48bd390ee2 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -33,12 +33,43 @@
 {% block subHeader %}
 <img src="{{ u.banner_url}}" class="-mb-0.5 w-full h-72 lg:h-[28rem] object-cover"/>
 <div class="relative max-w-screen-2xl mx-auto px-4 py-4 grid grid-cols-12 rounded-t">
-	{% if v and v.id == u.id %}
-	<a href="/settings/profile" class="absolute -top-12 right-3 btn btn-gray shadow">
-		<i class="fas fa-user-edit fa-fw fa-sm mr-2"></i>
-		Edit profile
-	</a>
-	{% endif %}
+	<div class="absolute -top-12 right-3">
+		<ul class="flex flex-wrap space-x-2 items-center mb-0">
+			<li>
+				{% include '/dropdowns/ProfileDropdown.html' %}
+			</li>
+			{% if v and v.id == u.id %}
+			<li>
+				<a href="/settings/profile" class="absolute -top-12 right-3 btn btn-gray shadow">
+					<i class="fas fa-user-edit fa-fw fa-sm mr-2"></i>
+					Edit profile
+				</a>
+			</li>
+			{% endif %}
+			{% if v and v.id != u.id %}
+				<li>
+					<button class="btn btn-gray" onclick="toggleElement('profile-toggleable-mobile', 'message-mobile')">
+						<i class="fas fa-paper-plane fa-sm fa-fw md:mr-1"></i>
+						<span class="hidden md:inline-block">Message</span>
+					</button >
+				</li>
+				{% if u.id != 995 %}
+				<li id="button-unsub2" class="{% if not is_following %}hidden{% endif %}">
+					<button class="btn btn-gray" onclick="post_toast2('/unfollow/{{u.username}}','button-unsub2','button-sub2')">
+						<i class="fas fa-heart-broken fa-sm fa-fw mr-1"></i>
+						Unfollow
+					</button>
+				</li>
+				{% endif %}
+				<li id="button-sub2" class="{% if is_following or u.is_nofollow or u.is_blocked %}hidden{% endif %}">
+					<button class="btn btn-gray" onclick="post_toast2('/follow/{{u.username}}','button-unsub2','button-sub2')">
+						<i class="far fa-heart fa-sm fa-fw mr-1"></i>
+						Follow
+					</button>		
+				</li>
+			{% endif %}
+		</ul>
+	</div>
 	<div class="absolute top-0 left-0 w-full h-full bg-gradient-to-t from-gray-300 to-gray-200 rounded-t sub-header-shadow"></div>
 	<div class="relative col-span-full flex items-center">
 		<div class="flex items-center">
@@ -105,33 +136,6 @@
 				{% endif %}
 			</ul>
 			{% endif %}
-			<ul class="flex flex-wrap space-x-2 items-center mb-0">
-				<li>
-					{% include '/dropdowns/ProfileDropdown.html' %}
-				</li>
-				{% if v and v.id != u.id %}
-					<li>
-						<button class="btn btn-gray" onclick="toggleElement('profile-toggleable-mobile', 'message-mobile')">
-							<i class="fas fa-paper-plane fa-sm fa-fw md:mr-1"></i>
-							<span class="hidden md:inline-block">Message</span>
-						</button >
-					</li>
-					{% if u.id != 995 %}
-					<li id="button-unsub2" class="{% if not is_following %}hidden{% endif %}">
-						<button class="btn btn-gray" onclick="post_toast2('/unfollow/{{u.username}}','button-unsub2','button-sub2')">
-							<i class="fas fa-heart-broken fa-sm fa-fw mr-1"></i>
-							Unfollow
-						</button>
-					</li>
-					{% endif %}
-					<li id="button-sub2" class="{% if is_following or u.is_nofollow or u.is_blocked %}hidden{% endif %}">
-						<button class="btn btn-gray" onclick="post_toast2('/follow/{{u.username}}','button-unsub2','button-sub2')">
-							<i class="far fa-heart fa-sm fa-fw mr-1"></i>
-							Follow
-						</button>		
-					</li>
-				{% endif %}
-			</ul>
 		</div>
 	</div>
 	<div class="relative col-span-full flex xl:hidden flex-col">