diff --git a/src/renderer/features/folders/components/folder-list-content.tsx b/src/renderer/features/folders/components/folder-list-content.tsx
index 55970ff8c..f31c3f22d 100644
--- a/src/renderer/features/folders/components/folder-list-content.tsx
+++ b/src/renderer/features/folders/components/folder-list-content.tsx
@@ -86,7 +86,8 @@ interface FolderListViewProps {
 export const FolderListView = ({ folderQuery }: FolderListViewProps) => {
     const { display, table } = useListSettings(ItemListKey.SONG);
     const { setItemCount } = useListContext();
-    const { navigateToFolder } = useFolderListFilters();
+    const { currentFolderId, navigateToFolder } = useFolderListFilters();
+    const serverId = useCurrentServerId();
 
     const { handleOnScrollEnd, scrollOffset } = useItemListScrollPersist({
         enabled: true,
@@ -187,6 +188,7 @@ export const FolderListView = ({ folderQuery }: FolderListViewProps) => {
                         type: 'offset',
                     }}
                     itemType={LibraryItem.FOLDER}
+                    key={`folder-${serverId}-${currentFolderId}`}
                     onColumnReordered={handleColumnReordered}
                     onColumnResized={handleColumnResized}
                     onScrollEnd={handleOnScrollEnd}