diff --git a/public/scripts/chats.js b/public/scripts/chats.js
index a6094b7f7..a264ee689 100644
--- a/public/scripts/chats.js
+++ b/public/scripts/chats.js
@@ -575,8 +575,8 @@ export function isExternalMediaAllowed() {
     return !power_user.forbid_external_media;
 }
 
-async function enlargeMessageImage() {
-    const mesBlock = $(this).closest('.mes');
+function expandMessageImage(event) {
+    const mesBlock = $(event.currentTarget).closest('.mes');
     const mesId = mesBlock.attr('mesid');
     const message = chat[mesId];
     const imgSrc = message?.extra?.image;
@@ -620,7 +620,12 @@ async function enlargeMessageImage() {
         popup.completeCancelled();
     });
 
-    await popup.show();
+    popup.show();
+    return img;
+}
+
+function expandAndZoomMessageImage(event) {
+    expandMessageImage(event).click();
 }
 
 async function deleteMessageImage() {
@@ -1603,7 +1608,8 @@ jQuery(function () {
         reloadCurrentChat();
     });
 
-    $(document).on('click', '.mes_img_enlarge', enlargeMessageImage);
+    $(document).on('click', '.mes_img', expandMessageImage);
+    $(document).on('click', '.mes_img_enlarge', expandAndZoomMessageImage);
     $(document).on('click', '.mes_img_delete', deleteMessageImage);
 
     $('#file_form_input').on('change', async () => {
diff --git a/public/style.css b/public/style.css
index 7355c4f7b..6f736996b 100644
--- a/public/style.css
+++ b/public/style.css
@@ -4995,6 +4995,7 @@ a:hover {
     max-width: 100%;
     max-height: 40vh;
     image-rendering: -webkit-optimize-contrast;
+    cursor: pointer;
 }
 
 .mes_img_swipes,