diff --git a/files/assets/js/core.js b/files/assets/js/core.js
index db1c51bdf..ae506c182 100644
--- a/files/assets/js/core.js
+++ b/files/assets/js/core.js
@@ -598,11 +598,11 @@ function handleUploadProgress(e, upload_prog) {
 	}
 }
 
-window.addEventListener('show.bs.modal', function () {
+document.getElementById('expandImageModal').addEventListener('show.bs.modal', function () {
 	location.hash = "modal";
 });
 
-window.addEventListener('hide.bs.modal', function () {
+document.getElementById('expandImageModal').addEventListener('hide.bs.modal', function () {
 	if(location.hash == "#modal") {
 		history.back();
 	}