diff --git a/web/src/lib/components/assets/thumbnail/thumbnail.svelte b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
index bc0f2567e7..8e13e4b23e 100644
--- a/web/src/lib/components/assets/thumbnail/thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
@@ -319,19 +319,6 @@
         </a>
       {/if}
 
-      <!-- View Asset while selecting -->
-      {#if mouseOver && selectionActive}
-        <button
-          type="button"
-          onclick={onViewerIconClickedHandler}
-          class={['absolute focus:outline-none bottom-2 end-2', { 'cursor-not-allowed': disabled }]}
-          tabindex={-1}
-          {disabled}
-        >
-          <Icon path={mdiMagnifyPlusOutline} size="24" class="text-white/80 hover:text-white" />
-        </button>
-      {/if}
-
       <ImageThumbnail
         class={imageClass}
         {brokenAssetClass}
@@ -366,6 +353,19 @@
         </div>
       {/if}
 
+      <!-- View Asset while selecting -->
+      {#if mouseOver && selectionActive}
+        <button
+          type="button"
+          onclick={onViewerIconClickedHandler}
+          class={['absolute focus:outline-none bottom-2 end-2', { 'cursor-not-allowed': disabled }]}
+          tabindex={-1}
+          {disabled}
+        >
+          <Icon path={mdiMagnifyPlusOutline} size="24" class="text-white/80 hover:text-white" />
+        </button>
+      {/if}
+
       {#if (!loaded || thumbError) && asset.thumbhash}
         <canvas
           use:thumbhash={{ base64ThumbHash: asset.thumbhash }}
diff --git a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte
index 0a4bc6efeb..cbc82c5ca5 100644
--- a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte
+++ b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte
@@ -494,8 +494,8 @@
         >
           <Thumbnail
             readonly={disableAssetSelect}
-            onClick={() => {
-              if (assetInteraction.selectionActive) {
+            onClick={(asset, forceView: boolean = false) => {
+              if (assetInteraction.selectionActive && !forceView) {
                 handleSelectAssets(toTimelineAsset(currentAsset));
                 return;
               }
@@ -507,6 +507,7 @@
             asset={toTimelineAsset(currentAsset)}
             selected={assetInteraction.hasSelectedAsset(currentAsset.id)}
             selectionCandidate={assetInteraction.hasSelectionCandidate(currentAsset.id)}
+            selectionActive={assetInteraction.selectionActive}
             thumbnailWidth={layout.width}
             thumbnailHeight={layout.height}
           />