diff --git a/packages/shared/components/MediaDisplay.svelte b/packages/shared/components/MediaDisplay.svelte
index 8b578c1ab34..8df73db2c8a 100644
--- a/packages/shared/components/MediaDisplay.svelte
+++ b/packages/shared/components/MediaDisplay.svelte
@@ -32,7 +32,7 @@
 
 <div class="h-full w-full object-cover">
     {#if htmlTag === ParentMimeType.Image}
-        <img {src} {alt} loading="lazy" class="w-full h-full" />
+        <img {src} {alt} loading="lazy" class="w-full h-full object-cover" />
     {:else if htmlTag === ParentMimeType.Video}
         <video
             loop={loop ? true : undefined}
@@ -42,7 +42,7 @@
             on:mouseenter={startPlaying}
             on:mouseleave={stopPlaying}
             preload="metadata"
-            class="w-full h-full"
+            class="w-full h-full object-cover"
         >
             <source {src} type={expectedType} />
         </video>
diff --git a/packages/shared/components/NftActivityDetails.svelte b/packages/shared/components/NftActivityDetails.svelte
index 2c7a9b3e2b6..5920266e312 100644
--- a/packages/shared/components/NftActivityDetails.svelte
+++ b/packages/shared/components/NftActivityDetails.svelte
@@ -31,6 +31,9 @@
         closePopup()
         $selectedNftId = activity.nftId
         $dashboardRouter.goTo(DashboardRoute.Collectibles)
+        // ugly hack to make sure router routes correctly
+        await tick()
+        // ugly hack to avoid a crash when navigating very fast between gallery and details
         await tick()
         $collectiblesRouter.goTo(CollectiblesRoute.Details)
     }