diff --git a/src/renderer/components/item-list/item-grid-list/item-grid-list.tsx b/src/renderer/components/item-list/item-grid-list/item-grid-list.tsx
index cd37b53ec..f6df65b57 100644
--- a/src/renderer/components/item-list/item-grid-list/item-grid-list.tsx
+++ b/src/renderer/components/item-list/item-grid-list/item-grid-list.tsx
@@ -8,6 +8,7 @@ import React, {
     CSSProperties,
     memo,
     ReactNode,
+    Ref,
     RefObject,
     useCallback,
     useEffect,
@@ -150,10 +151,21 @@ const VirtualizedGridList = React.memo(
             return null;
         }
 
+        const calculateInitialScrollOffset = (): number => {
+            if (!initialTop) return 0;
+
+            if (initialTop.type === 'offset') {
+                return initialTop.to;
+            }
+
+            const rowIndex = Math.floor(initialTop.to / (tableMeta?.columnCount || 1));
+            return rowIndex * (tableMeta?.itemHeight || 0);
+        };
+
         return (
             <FixedSizeList
                 height={height}
-                initialScrollOffset={initialTop || 0}
+                initialScrollOffset={calculateInitialScrollOffset()}
                 itemCount={itemData.tableMeta?.rowCount || 0}
                 itemData={itemData}
                 itemSize={itemData.tableMeta?.itemHeight || 0}
@@ -251,13 +263,16 @@ export interface ItemGridListProps {
     enableSelection?: boolean;
     gap?: 'lg' | 'md' | 'sm' | 'xl' | 'xs';
     getRowId?: ((item: unknown) => string) | string;
-    initialTop?: number;
+    initialTop?: {
+        to: number;
+        type: 'index' | 'offset';
+    };
     itemsPerRow?: number;
     itemType: LibraryItem;
     onRangeChanged?: (range: { startIndex: number; stopIndex: number }) => void;
     onScroll?: (offset: number, direction: 'down' | 'up') => void;
     onScrollEnd?: (offset: number, direction: 'down' | 'up') => void;
-    ref?: RefObject<ItemListHandle>;
+    ref?: Ref<ItemListHandle>;
 }
 
 export const ItemGridList = ({
@@ -503,7 +518,7 @@ export const ItemGridList = ({
                                 internalState.extractRowId(rangeItem)
                             ) {
                                 rangeItems.push(
-                                    rangeItem as ItemListStateItemWithRequiredProperties,
+                                    rangeItem as unknown as ItemListStateItemWithRequiredProperties,
                                 );
                             }
                         }
diff --git a/src/renderer/features/albums/components/album-list-infinite-grid.tsx b/src/renderer/features/albums/components/album-list-infinite-grid.tsx
index d7e26ee76..4a63fc015 100644
--- a/src/renderer/features/albums/components/album-list-infinite-grid.tsx
+++ b/src/renderer/features/albums/components/album-list-infinite-grid.tsx
@@ -56,7 +56,10 @@ export const AlbumListInfiniteGrid = forwardRef<any, AlbumListInfiniteGridProps>
             <ItemGridList
                 data={data}
                 gap={gap}
-                initialTop={scrollOffset ?? 0}
+                initialTop={{
+                    to: scrollOffset ?? 0,
+                    type: 'offset',
+                }}
                 itemsPerRow={itemsPerRow}
                 itemType={LibraryItem.ALBUM}
                 onRangeChanged={onRangeChanged}
diff --git a/src/renderer/features/artists/components/album-artist-list-infinite-grid.tsx b/src/renderer/features/artists/components/album-artist-list-infinite-grid.tsx
index db0dc4fae..6cde6e78f 100644
--- a/src/renderer/features/artists/components/album-artist-list-infinite-grid.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-infinite-grid.tsx
@@ -57,7 +57,10 @@ export const AlbumArtistListInfiniteGrid = forwardRef<any, AlbumArtistListInfini
             <ItemGridList
                 data={data}
                 gap={gap}
-                initialTop={scrollOffset ?? 0}
+                initialTop={{
+                    to: scrollOffset ?? 0,
+                    type: 'offset',
+                }}
                 itemsPerRow={itemsPerRow}
                 itemType={LibraryItem.ALBUM_ARTIST}
                 onRangeChanged={onRangeChanged}
diff --git a/src/renderer/features/artists/components/artist-list-infinite-grid.tsx b/src/renderer/features/artists/components/artist-list-infinite-grid.tsx
index 3edcdebb9..817c68c6f 100644
--- a/src/renderer/features/artists/components/artist-list-infinite-grid.tsx
+++ b/src/renderer/features/artists/components/artist-list-infinite-grid.tsx
@@ -57,7 +57,10 @@ export const ArtistListInfiniteGrid = forwardRef<any, ArtistListInfiniteGridProp
             <ItemGridList
                 data={data}
                 gap={gap}
-                initialTop={scrollOffset ?? 0}
+                initialTop={{
+                    to: scrollOffset ?? 0,
+                    type: 'offset',
+                }}
                 itemsPerRow={itemsPerRow}
                 itemType={LibraryItem.ARTIST}
                 onRangeChanged={onRangeChanged}
diff --git a/src/renderer/features/genres/components/genre-list-infinite-grid.tsx b/src/renderer/features/genres/components/genre-list-infinite-grid.tsx
index e76e85026..667e9a82c 100644
--- a/src/renderer/features/genres/components/genre-list-infinite-grid.tsx
+++ b/src/renderer/features/genres/components/genre-list-infinite-grid.tsx
@@ -57,7 +57,10 @@ export const GenreListInfiniteGrid = forwardRef<any, GenreListInfiniteGridProps>
             <ItemGridList
                 data={data}
                 gap={gap}
-                initialTop={scrollOffset ?? 0}
+                initialTop={{
+                    to: scrollOffset ?? 0,
+                    type: 'offset',
+                }}
                 itemsPerRow={itemsPerRow}
                 itemType={LibraryItem.GENRE}
                 onRangeChanged={onRangeChanged}
diff --git a/src/renderer/features/songs/components/song-list-infinite-grid.tsx b/src/renderer/features/songs/components/song-list-infinite-grid.tsx
index d7b45c612..88f4d016f 100644
--- a/src/renderer/features/songs/components/song-list-infinite-grid.tsx
+++ b/src/renderer/features/songs/components/song-list-infinite-grid.tsx
@@ -52,7 +52,10 @@ export const SongListInfiniteGrid = forwardRef<any, SongListInfiniteGridProps>(
             <ItemGridList
                 data={data}
                 gap={gap}
-                initialTop={scrollOffset ?? 0}
+                initialTop={{
+                    to: scrollOffset ?? 0,
+                    type: 'offset',
+                }}
                 itemsPerRow={itemsPerRow}
                 itemType={LibraryItem.SONG}
                 onRangeChanged={onRangeChanged}