diff --git a/files/assets/js/comments+submission_listing.js b/files/assets/js/comments+submission_listing.js
index 0060df761..ebd21895e 100644
--- a/files/assets/js/comments+submission_listing.js
+++ b/files/assets/js/comments+submission_listing.js
@@ -14,8 +14,12 @@ 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;
+    history.pushState(null, null, '#modal');
 };
 
+document.getElementById('expandImageModal').addEventListener('hidden.bs.modal', function (event) {
+    window.location.hash = "";
+});
 
 function popovertrigger() {
     const popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'));
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 1f6226b32..f74b67cdf 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -857,7 +857,7 @@
 
 {% include "expanded_image_modal.html" %}
 
-<script src="/static/assets/js/comments+submission_listing.js?a=6"></script>
+<script src="/static/assets/js/comments+submission_listing.js?a=7"></script>
 <script src="/static/assets/js/comments.js?a=4"></script>
 
 <script>
diff --git a/files/templates/expanded_image_modal.html b/files/templates/expanded_image_modal.html
index e0681b29a..4113ba80d 100644
--- a/files/templates/expanded_image_modal.html
+++ b/files/templates/expanded_image_modal.html
@@ -25,4 +25,6 @@
 	.m-5 {
 		margin: 2.5rem !important;
 	}
-</style>
\ No newline at end of file
+</style>
+<script>
+</script>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 2e536e49b..83bace10a 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -698,5 +698,5 @@
 </style>
 
 <script src="/static/assets/js/clipboard.js?a=3"></script>
-<script src="/static/assets/js/comments+submission_listing.js?a=6"></script>
+<script src="/static/assets/js/comments+submission_listing.js?a=7"></script>
 <script src="/static/assets/js/submission_listing.js?a=3"></script>
\ No newline at end of file