diff --git a/src/renderer/features/albums/components/album-detail-content.tsx b/src/renderer/features/albums/components/album-detail-content.tsx
index ce8de7ad..f8ed9e25 100644
--- a/src/renderer/features/albums/components/album-detail-content.tsx
+++ b/src/renderer/features/albums/components/album-detail-content.tsx
@@ -8,7 +8,7 @@ import {
   useFixedTableHeader,
   VirtualTable,
 } from '/@/renderer/components';
-import { CellContextMenuEvent, ColDef } from '@ag-grid-community/core';
+import { CellContextMenuEvent, ColDef, RowDoubleClickedEvent } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 import { Box, Group, Stack } from '@mantine/core';
 import { useSetState } from '@mantine/hooks';
@@ -26,7 +26,7 @@ import { Play } from '/@/renderer/types';
 import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import { PlayButton, PLAY_TYPES } from '/@/renderer/features/shared';
 import { useAlbumList } from '/@/renderer/features/albums/queries/album-list-query';
-import { AlbumListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
+import { AlbumListSort, LibraryItem, QueueSong, SortOrder } from '/@/renderer/api/types';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 
 const ContentContainer = styled.div`
@@ -168,6 +168,14 @@ export const AlbumDetailContent = ({ tableRef }: AlbumDetailContentProps) => {
     });
   };
 
+  const handleRowDoubleClick = (e: RowDoubleClickedEvent<QueueSong>) => {
+    if (!e.data) return;
+    handlePlayQueueAdd?.({
+      byData: [e.data],
+      play: playButtonBehavior,
+    });
+  };
+
   const { intersectRef, tableContainerRef } = useFixedTableHeader();
 
   return (
@@ -216,10 +224,12 @@ export const AlbumDetailContent = ({ tableRef }: AlbumDetailContentProps) => {
         <VirtualTable
           ref={tableRef}
           animateRows
+          deselectOnClickOutside
           detailRowAutoHeight
           maintainColumnOrder
           suppressCellFocus
           suppressCopyRowsToClipboard
+          suppressHorizontalScroll
           suppressLoadingOverlay
           suppressMoveWhenRowDragging
           suppressPaginationPanel
@@ -240,6 +250,7 @@ export const AlbumDetailContent = ({ tableRef }: AlbumDetailContentProps) => {
           onGridSizeChanged={(params) => {
             params.api.sizeColumnsToFit();
           }}
+          onRowDoubleClicked={handleRowDoubleClick}
         />
       </Box>
       <Stack
diff --git a/src/renderer/features/playlists/components/playlist-detail-content.tsx b/src/renderer/features/playlists/components/playlist-detail-content.tsx
index 8409815b..f3ac5cfc 100644
--- a/src/renderer/features/playlists/components/playlist-detail-content.tsx
+++ b/src/renderer/features/playlists/components/playlist-detail-content.tsx
@@ -1,4 +1,4 @@
-import { CellContextMenuEvent, ColDef } from '@ag-grid-community/core';
+import { CellContextMenuEvent, ColDef, RowDoubleClickedEvent } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 import { Box, Group } from '@mantine/core';
 import { closeAllModals, openModal } from '@mantine/modals';
@@ -11,7 +11,13 @@ import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { LibraryItem, SortOrder, UserListQuery, UserListSort } from '/@/renderer/api/types';
+import {
+  LibraryItem,
+  QueueSong,
+  SortOrder,
+  UserListQuery,
+  UserListSort,
+} from '/@/renderer/api/types';
 import {
   Button,
   ConfirmModal,
@@ -36,6 +42,7 @@ import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 import { Play } from '/@/renderer/types';
 
 const ContentContainer = styled.div`
+  position: relative;
   display: flex;
   flex-direction: column;
   max-width: 1920px;
@@ -117,8 +124,6 @@ export const PlaylistDetailContent = ({ tableRef }: PlaylistDetailContentProps)
     [playlistSongsQueryInfinite.data?.pages],
   );
 
-  console.log('playlistSongData', playlistSongData);
-
   const { intersectRef, tableContainerRef } = useFixedTableHeader();
 
   const deletePlaylistMutation = useDeletePlaylist();
@@ -207,6 +212,14 @@ export const PlaylistDetailContent = ({ tableRef }: PlaylistDetailContentProps)
     });
   };
 
+  const handleRowDoubleClick = (e: RowDoubleClickedEvent<QueueSong>) => {
+    if (!e.data) return;
+    handlePlayQueueAdd?.({
+      byData: [e.data],
+      play: playButtonBehavior,
+    });
+  };
+
   const loadMoreRef = useRef<HTMLButtonElement | null>(null);
 
   return (
@@ -256,10 +269,12 @@ export const PlaylistDetailContent = ({ tableRef }: PlaylistDetailContentProps)
         <VirtualTable
           ref={tableRef}
           animateRows
+          deselectOnClickOutside
           detailRowAutoHeight
           maintainColumnOrder
           suppressCellFocus
           suppressCopyRowsToClipboard
+          suppressHorizontalScroll
           suppressLoadingOverlay
           suppressMoveWhenRowDragging
           suppressPaginationPanel
@@ -268,7 +283,10 @@ export const PlaylistDetailContent = ({ tableRef }: PlaylistDetailContentProps)
           columnDefs={columnDefs}
           defaultColDef={defaultColumnDefs}
           enableCellChangeFlash={false}
-          getRowId={(data) => data.data.id}
+          getRowId={(data) => {
+            // It's possible that there are duplicate song ids in a playlist
+            return `${data.data.id}-${data.data.pageIndex}`;
+          }}
           rowData={playlistSongData}
           rowHeight={60}
           rowSelection="multiple"
@@ -280,6 +298,7 @@ export const PlaylistDetailContent = ({ tableRef }: PlaylistDetailContentProps)
           onGridSizeChanged={(params) => {
             params.api.sizeColumnsToFit();
           }}
+          onRowDoubleClicked={handleRowDoubleClick}
         />
       </Box>
       <MotionGroup
diff --git a/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx b/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
index e05156db..f49ecc3a 100644
--- a/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
+++ b/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
@@ -135,8 +135,6 @@ const PlaylistDetailSongListRoute = () => {
     setIsQueryBuilderExpanded(true);
   };
 
-  console.log('detailQuery?.data?.rules', detailQuery?.data?.rules);
-
   return (
     <AnimatedPage key={`playlist-detail-songList-${playlistId}`}>
       <Stack