diff --git a/files/templates/comments.html b/files/templates/comments.html
index bfcac96e51..c01bbfd402 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -12,48 +12,7 @@
 		{% include "award_modal.html" %}
 	{% endif %}
 
-	<div style="display:none" id="popover">
-		<div class="popover-user-profile" role="tooltip">
-			<img loading="lazy" class="pop-banner w-100 h-64 object-cover">
-			<div class="d-flex align-items-end px-3 mt-n6 mb-3">
-				<img  loading="lazy" class="pop-picture avatar-72 rounded img-thumbnail shadow-sm">
-				<div class="px-3 text-truncate">
-				<h5 class="pop-username text-truncate text-black"></h5>
-				</div>
-			</div>
-
-			{% if FEATURES['USERS_PROFILE_BODYTEXT'] -%}
-			<div class="px-3">
-				<span class="pop-bio popover-bio text-black"></span>
-			</div>
-			{%- endif %}
-
-			{% if FEATURES['BADGES'] -%}
-			<div class="pop-badges ml-3 mr-3 my-2">
-			</div>
-			{%- endif %}
-
-		<div class="border-top d-flex align-items-center p-3 gap-3 smol">
-			<span>
-			<strong class="pop-postcount text-black"></strong>
-			<span class="text-black">posts</span>
-			</span>
-			<span class="ml-3">
-			<strong class="pop-commentcount text-black"></strong>
-			<span class="text-black">comments</span>
-			</span>
-			<span class="ml-3">
-				<strong class="pop-coins text-black"></strong>
-				<span class="text-black">coins</span>
-			</span> 
-			&nbsp;&nbsp;&nbsp;&nbsp;
-			<a href="/" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} class="pop-viewmore ml-auto text-decoration-none">
-			View
-			<i class="fas fa-arrow-right fa-sm px-1"></i>
-			</a>
-		</div>
-		</div>
-	</div>
+	{% include "popover.html" %}
 {% endif %}
 
 {% macro single_comment(c, level=1) %}
diff --git a/files/templates/popover.html b/files/templates/popover.html
new file mode 100644
index 0000000000..d6928cce7e
--- /dev/null
+++ b/files/templates/popover.html
@@ -0,0 +1,42 @@
+<div style="display:none" id="popover">
+	<div class="popover-user-profile" role="tooltip">
+		<img loading="lazy" class="pop-banner w-100 h-64 object-cover">
+		<div class="d-flex align-items-end px-3 mt-n6 mb-3">
+			<img  loading="lazy" class="pop-picture avatar-72 rounded img-thumbnail shadow-sm">
+			<div class="px-3 text-truncate">
+			<h5 class="pop-username text-truncate text-black"></h5>
+			</div>
+		</div>
+
+		{% if FEATURES['USERS_PROFILE_BODYTEXT'] -%}
+		<div class="px-3">
+			<span class="pop-bio popover-bio text-black"></span>
+		</div>
+		{%- endif %}
+
+		{% if FEATURES['BADGES'] -%}
+		<div class="pop-badges ml-3 mr-3 my-2">
+		</div>
+		{%- endif %}
+
+	<div class="border-top d-flex align-items-center p-3 gap-3 smol">
+		<span>
+		<strong class="pop-postcount text-black"></strong>
+		<span class="text-black">posts</span>
+		</span>
+		<span class="ml-3">
+		<strong class="pop-commentcount text-black"></strong>
+		<span class="text-black">comments</span>
+		</span>
+		<span class="ml-3">
+			<strong class="pop-coins text-black"></strong>
+			<span class="text-black">coins</span>
+		</span> 
+		&nbsp;&nbsp;&nbsp;&nbsp;
+		<a href="/" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} class="pop-viewmore ml-auto text-decoration-none">
+		View
+		<i class="fas fa-arrow-right fa-sm px-1"></i>
+		</a>
+	</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 55018e92f9..919c3e1235 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -15,48 +15,7 @@
 	<script src="/assets/js/new_comments_count.js?v=242"></script>
 {% endif %}
 
-<div style="display:none" id="popover">
-	<div class="popover-user-profile" role="tooltip">
-		<img loading="lazy" class="pop-banner w-100 h-64 object-cover">
-		<div class="d-flex align-items-end px-3 mt-n6 mb-3">
-			<img loading="lazy" class="pop-picture avatar-72 rounded img-thumbnail shadow-sm">
-			<div class="px-3 text-truncate">
-			<h5 class="pop-username text-truncate text-black"></h5>
-			</div>
-		</div>
-
-		{% if FEATURES['USERS_PROFILE_BODYTEXT'] -%}
-		<div class="px-3">
-			<span class="pop-bio popover-bio text-black"></span>
-		</div>
-		{%- endif %}
-
-		{% if FEATURES['BADGES'] -%}
-		<div class="pop-badges ml-3 mr-3 my-2">
-		</div>
-		{%- endif %}
-
-	 <div class="border-top d-flex align-items-center p-3 gap-3 smol">
-		<span>
-		 <strong class="pop-postcount text-black"></strong>
-		 <span class="text-black">posts</span>
-		</span>
-		<span class="ml-3">
-		 <strong class="pop-commentcount text-black"></strong>
-		 <span class="text-black">comments</span>
-		</span>
-		<span class="ml-3">
-			<strong class="pop-coins text-black"></strong>
-			<span class="text-black">coins</span>
-		</span> 
-		&nbsp;&nbsp;&nbsp;&nbsp;
-		<a href="/" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} class="pop-viewmore ml-auto text-decoration-none">
-		 View
-		 <i class="fas fa-arrow-right fa-sm px-1"></i>
-		</a>
-	 </div>
-	</div>
-</div>
+{% include "popover.html" %}
 
 {% for p in listing if p.can_see(v)  %}