diff --git a/files/assets/js/core.js b/files/assets/js/core.js
index ff55e1b146..f2c05a38c4 100644
--- a/files/assets/js/core.js
+++ b/files/assets/js/core.js
@@ -700,8 +700,6 @@ document.addEventListener('hide.bs.modal', () => {
 	if (typeof close_inline_emoji_modal === "function") {
 		close_inline_emoji_modal();
 	}
-	document.getElementById('imgnav-next').classList.add('d-none')
-	document.getElementById('imgnav-prev').classList.add('d-none')
 });
 
 document.querySelectorAll('form').forEach(form => {
diff --git a/files/assets/js/expanded_image_modal.js b/files/assets/js/expanded_image_modal.js
index b07708b0f6..f3bf40af48 100644
--- a/files/assets/js/expanded_image_modal.js
+++ b/files/assets/js/expanded_image_modal.js
@@ -4,6 +4,7 @@ let last_img_index
 
 const imgnav_next = document.getElementById('imgnav-next')
 const imgnav_prev = document.getElementById('imgnav-prev')
+const expandImageModal = document.getElementById('expandImageModal')
 
 document.addEventListener('keydown', (e) => {
 	if (['ArrowRight', 'd'].includes(e.key)  && imgnav_next && !imgnav_next.classList.contains('d-none')) {
@@ -14,6 +15,11 @@ document.addEventListener('keydown', (e) => {
 	}
 })
 
+expandImageModal.addEventListener('hide.bs.modal', () => {
+	imgnav_next.classList.add('d-none')
+	imgnav_prev.classList.add('d-none')
+});
+
 function handle_navigation(delta) {
 	position += delta
 	if (position < last_img_index) {
@@ -26,8 +32,6 @@ function handle_navigation(delta) {
 	}
 }
 
-const expandImageModal = document.getElementById('expandImageModal')
-
 function expandImage(url) {
 	document.getElementById('imgnav-next').classList.add('d-none')
 	document.getElementById('imgnav-prev').classList.add('d-none')