diff --git a/files/templates/comments.html b/files/templates/comments.html
index 44772aa1c..fc0601bd2 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -23,6 +23,7 @@
 	}
 </style>
 
+{% include "expanded_image_modal.html" %}
 
 {% macro single_comment(c, level=1) %}
 
@@ -816,8 +817,6 @@ window.addEventListener('DOMContentLoaded', function() {
 	});
 </script>
 
-{% include "expanded_image_modal.html" %}
-
 
 <script>
 window.addEventListener('DOMContentLoaded', function() {
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index f48d8f554..1fcd18737 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -1,5 +1,6 @@
 {% extends "default.html" %}
 {% block title %}
+{% include "expanded_image_modal.html" %}
 <title>{{'SITE_NAME' | app_config}} - Formatting</title>
 <meta name="description" content="{{'SITE_NAME' | app_config}} Formatting">
 {% endblock %}
@@ -528,8 +529,6 @@ line breaks
 	</tbody>
 </table>
 
-{% include "expanded_image_modal.html" %}
-
 <style>
 	@media (max-width: 767.98px) {
 		table {
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 63120bfb7..be228b188 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -15,6 +15,8 @@
 
 <script defer src="/assets/js/new_comments_count.js?v=53"></script>
 
+{% include "expanded_image_modal.html" %}
+
 {% if p.award_count("train") %}
 	<style>
 		@keyframes train {
@@ -911,7 +913,6 @@ window.addEventListener('DOMContentLoaded', function() {
 			{% include "ban_modal.html" %}
 		{% endif %}
 	{% endif %}
-	{% include "expanded_image_modal.html" %}
 {% endif %}
 
 {% if p.award_count("shit") %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 7c447bd02..74b635b27 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -4,6 +4,8 @@
 	{% set cc='COUNTRY CLUB' %}
 {% endif %}
 
+{% include "expanded_image_modal.html" %}
+
 <script defer src="/assets/js/new_comments_count.js?v=53"></script>
 
 {% for p in listing %}
@@ -578,7 +580,6 @@ window.addEventListener('DOMContentLoaded', function() {
 		{% include "ban_modal.html" %}
 	{% endif %}
 {% endif %}
-{% include "expanded_image_modal.html" %}
 
 <style>
 	.popover {