diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index 93e023643..d1c82371e 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -5924,12 +5924,6 @@ a.emojitab {
 	border: 1px solid var(--primary) !important;
 }
 
-.expandedimage {
-	width: fit-content;
-	width: -moz-fit-content;
-	max-width: 80% !important;
-}
-
 .m-5 {
 	margin: 2.5rem !important;
 }
@@ -7424,3 +7418,7 @@ th.disable-sort-click[disabled] {
 	font-weight: 900;
 	box-shadow: inset 0 -4px 0 white;
 }
+
+#expandImageModal a {
+	pointer-events: auto;
+}
diff --git a/files/templates/modals/expanded_image.html b/files/templates/modals/expanded_image.html
index 31b92449b..68ce5e5ba 100644
--- a/files/templates/modals/expanded_image.html
+++ b/files/templates/modals/expanded_image.html
@@ -1,13 +1,7 @@
-<div class="modal desktop-expanded-image-modal" id="expandImageModal" tabindex="-1">
-	<div class="modal-dialog modal-xl modal-dialog-centered mx-auto expandedimage">
-		<div class="modal-content bg-transparent shadow-none">
-			<div class="modal-body text-center p-0">
-				<div class="d-inline-block position-relative">
-					<a href="/" rel="nofollow noopener" target="_blank" id="desktop-expanded-image-wrap-link">
-						<img loading="lazy" alt="expanded image" class="rounded" id="desktop-expanded-image">
-					</a>
-				</div>
-			</div>
-		</div>
+<div class="modal" id="expandImageModal">
+	<div class="modal-dialog modal-dialog-centered">
+		<a rel="nofollow noopener" target="_blank" id="desktop-expanded-image-wrap-link">
+			<img loading="lazy" alt="expanded image" class="rounded" id="desktop-expanded-image">
+		</a>
 	</div>
 </div>