diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx
index e0eac5d0..afefde34 100644
--- a/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx
+++ b/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx
@@ -125,6 +125,12 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten
     [filters, pagination.scrollOffset, playlistId, queryClient, server],
   );
 
+  const handleGridSizeChange = () => {
+    if (page.table.autoFit) {
+      tableRef?.current?.api.sizeColumnsToFit();
+    }
+  };
+
   const onPaginationChanged = useCallback(
     (event: PaginationChangedEvent) => {
       if (!isPaginationEnabled || !event.api) return;
@@ -211,6 +217,7 @@ export const PlaylistDetailSongListContent = ({ tableRef }: PlaylistDetailConten
         onColumnMoved={handleColumnChange}
         onColumnResized={debouncedColumnChange}
         onGridReady={onGridReady}
+        onGridSizeChanged={handleGridSizeChange}
         onPaginationChanged={onPaginationChanged}
         onRowDoubleClicked={handleRowDoubleClick}
       />
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 19310786..0947b31b 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
@@ -16,7 +16,7 @@ import { useDeletePlaylist } from '/@/renderer/features/playlists/mutations/dele
 import { Button, Paper, Text, toast, VirtualGridContainer } from '/@/renderer/components';
 import { SaveAsPlaylistForm } from '/@/renderer/features/playlists/components/save-as-playlist-form';
 import { useCurrentServer } from '/@/renderer/store';
-import { ServerType, SongListSort, SortOrder } from '/@/renderer/api/types';
+import { ServerType, SongListSort } from '/@/renderer/api/types';
 
 const PlaylistDetailSongListRoute = () => {
   const navigate = useNavigate();
@@ -178,6 +178,7 @@ const PlaylistDetailSongListRoute = () => {
                   <Text>Query Editor</Text>
                 </Group>
                 <PlaylistQueryBuilder
+                  key={JSON.stringify(detailQuery?.data?.rules)}
                   isSaving={createPlaylistMutation?.isLoading}
                   limit={detailQuery?.data?.rules?.limit}
                   query={detailQuery?.data?.rules}