diff --git a/src/renderer/components/item-list/item-table-list/item-table-list.module.css b/src/renderer/components/item-list/item-table-list/item-table-list.module.css
index ef2e17c82..031cbccbc 100644
--- a/src/renderer/components/item-list/item-table-list/item-table-list.module.css
+++ b/src/renderer/components/item-list/item-table-list/item-table-list.module.css
@@ -26,6 +26,10 @@
     overflow: hidden;
 }
 
+.item-table-grid-container > div[role='grid'] {
+    height: unset !important;
+}
+
 .item-table-pinned-rows-container {
     position: relative;
     display: flex;
diff --git a/src/renderer/features/now-playing/components/play-queue.tsx b/src/renderer/features/now-playing/components/play-queue.tsx
index d82f51f77..a6fce437b 100644
--- a/src/renderer/features/now-playing/components/play-queue.tsx
+++ b/src/renderer/features/now-playing/components/play-queue.tsx
@@ -43,7 +43,6 @@ export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, sear
 
     const isFetching = useIsPlayerFetching();
     const tableRef = useRef<ItemListHandle>(null);
-    const previousSongCountRef = useRef<number>(0);
     const mergedRef = useMergedRef(ref, tableRef);
     const { getQueue } = usePlayerActions();
     const queueType = usePlayerQueueType();
@@ -52,7 +51,6 @@ export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, sear
 
     const [data, setData] = useState<QueueSong[]>([]);
     const [groups, setGroups] = useState<TableGroupHeader[]>([]);
-    const [containerKey, setContainerKey] = useState<string>(() => Math.random().toString(36));
 
     useEffect(() => {
         const setQueue = () => {
@@ -109,17 +107,6 @@ export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, sear
         };
     }, [getQueue, queueType, tableRef]);
 
-    useEffect(() => {
-        const currentCount = data.length;
-        const previousCount = previousSongCountRef.current;
-
-        if (previousCount === 0 && currentCount > 0) {
-            setContainerKey(Math.random().toString(36));
-        }
-
-        previousSongCountRef.current = currentCount;
-    }, [data.length]);
-
     const filteredData: QueueSong[] = useMemo(() => {
         if (debouncedSearchTerm) {
             const searched = searchLibraryItems(data, debouncedSearchTerm, LibraryItem.SONG);
@@ -164,7 +151,7 @@ export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, sear
     ]);
 
     return (
-        <div className={styles.container} key={containerKey} ref={containerFocusRef}>
+        <div className={styles.container} ref={containerFocusRef}>
             <LoadingOverlay pos="absolute" visible={isFetching} />
             <ItemTableList
                 activeRowId={currentSongUniqueId}