diff --git a/files/templates/comments.html b/files/templates/comments.html
index fc0601bd22..44772aa1c3 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -23,7 +23,6 @@
 	}
 </style>
 
-{% include "expanded_image_modal.html" %}
 
 {% macro single_comment(c, level=1) %}
 
@@ -817,6 +816,8 @@ window.addEventListener('DOMContentLoaded', function() {
 	});
 </script>
 
+{% include "expanded_image_modal.html" %}
+
 
 <script>
 window.addEventListener('DOMContentLoaded', function() {
diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html
index 6041dca3fd..13279ae240 100644
--- a/files/templates/expanded_image_modal.html
+++ b/files/templates/expanded_image_modal.html
@@ -1,13 +1,9 @@
 <script>
-window.addEventListener('DOMContentLoaded', function() {
 	function expandDesktopImage(image) {
 		document.getElementById("desktop-expanded-image").src = image.replace("200w_d.webp", "giphy.webp");
 		document.getElementById("desktop-expanded-image-link").href = image;
 		document.getElementById("desktop-expanded-image-wrap-link").href=image;
 	};
-
-
-});
 </script>
 
 
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 1fcd187378..f48d8f5543 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -1,6 +1,5 @@
 {% 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 %}
@@ -529,6 +528,8 @@ 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 be228b1888..63120bfb70 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -15,8 +15,6 @@
 
 <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 {
@@ -913,6 +911,7 @@ 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 74b635b27a..7c447bd02f 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -4,8 +4,6 @@
 	{% 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 %}
@@ -580,6 +578,7 @@ window.addEventListener('DOMContentLoaded', function() {
 		{% include "ban_modal.html" %}
 	{% endif %}
 {% endif %}
+{% include "expanded_image_modal.html" %}
 
 <style>
 	.popover {