diff --git a/src/renderer/features/albums/components/album-detail-content.tsx b/src/renderer/features/albums/components/album-detail-content.tsx
index 7c4e164a..14ad7927 100644
--- a/src/renderer/features/albums/components/album-detail-content.tsx
+++ b/src/renderer/features/albums/components/album-detail-content.tsx
@@ -254,8 +254,6 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
 
     const showGenres = detailQuery?.data?.genres ? detailQuery?.data?.genres.length !== 0 : false;
 
-    const { intersectRef, tableContainerRef } = useFixedTableHeader();
-
     const handleGeneralContextMenu = useHandleGeneralContextMenu(
         LibraryItem.ALBUM,
         ALBUM_CONTEXT_MENU_ITEMS,
@@ -269,7 +267,6 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
             <DetailContainer>
                 <Box component="section">
                     <Group
-                        ref={showGenres ? null : intersectRef}
                         py="1rem"
                         spacing="md"
                     >
@@ -308,7 +305,6 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                 </Box>
                 {showGenres && (
                     <Box
-                        ref={showGenres ? intersectRef : null}
                         component="section"
                         py="1rem"
                     >
@@ -334,14 +330,12 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                         </Group>
                     </Box>
                 )}
-                <Box
-                    ref={tableContainerRef}
-                    style={{ minHeight: '300px' }}
-                >
+                <Box style={{ minHeight: '300px' }}>
                     <VirtualTable
                         ref={tableRef}
                         autoFitColumns
                         autoHeight
+                        stickyHeader
                         suppressCellFocus
                         suppressHorizontalScroll
                         suppressLoadingOverlay
diff --git a/src/renderer/features/albums/routes/album-detail-route.tsx b/src/renderer/features/albums/routes/album-detail-route.tsx
index 5735d021..66d57d49 100644
--- a/src/renderer/features/albums/routes/album-detail-route.tsx
+++ b/src/renderer/features/albums/routes/album-detail-route.tsx
@@ -50,6 +50,7 @@ const AlbumDetailRoute = () => {
                             </LibraryHeaderBar.Title>
                         </LibraryHeaderBar>
                     ),
+                    offset: 200,
                     target: headerRef,
                 }}
             >
diff --git a/src/renderer/features/artists/routes/album-artist-detail-route.tsx b/src/renderer/features/artists/routes/album-artist-detail-route.tsx
index f3056f7d..5f8f9bb0 100644
--- a/src/renderer/features/artists/routes/album-artist-detail-route.tsx
+++ b/src/renderer/features/artists/routes/album-artist-detail-route.tsx
@@ -51,6 +51,7 @@ const AlbumArtistDetailRoute = () => {
                             </LibraryHeaderBar.Title>
                         </LibraryHeaderBar>
                     ),
+                    offset: 200,
                     target: headerRef,
                 }}
             >