diff --git a/src/lib/components/atoms/RowVirtualizer.svelte b/src/lib/components/atoms/RowVirtualizer.svelte
index 444b9c7..cf54777 100644
--- a/src/lib/components/atoms/RowVirtualizer.svelte
+++ b/src/lib/components/atoms/RowVirtualizer.svelte
@@ -22,6 +22,7 @@
       count,
       estimateSize: itemHeight,
       gap: itemGap,
+      overscan: 5,
       scrollMargin,
     }),
   );
diff --git a/src/lib/components/organisms/Gallery.svelte b/src/lib/components/organisms/Gallery.svelte
index dc9f157..e3dcdde 100644
--- a/src/lib/components/organisms/Gallery.svelte
+++ b/src/lib/components/organisms/Gallery.svelte
@@ -49,11 +49,7 @@
 <RowVirtualizer
   count={rows.length}
   itemHeight={(index) =>
-    rows[index]!.type === "header"
-      ? 28
-      : Math.ceil(rows[index]!.files.length / 4) * 181 +
-        (Math.ceil(rows[index]!.files.length / 4) - 1) * 4 +
-        16}
+    rows[index]!.type === "header" ? 28 : 185 + (rows[index]!.isLast ? 16 : 0)}
   class="flex flex-grow flex-col"
 >
   {#snippet item(index)}