diff --git a/src/renderer/features/context-menu/actions/play-action.tsx b/src/renderer/features/context-menu/actions/play-action.tsx
index 830e64a9d..aeb458368 100644
--- a/src/renderer/features/context-menu/actions/play-action.tsx
+++ b/src/renderer/features/context-menu/actions/play-action.tsx
@@ -22,7 +22,11 @@ export const PlayAction = ({ ids, itemType, songs }: PlayActionProps) => {
         (playType: Play) => {
             if (ids.length === 0 || !serverId) return;
 
-            if (itemType === LibraryItem.SONG) {
+            if (
+                itemType === LibraryItem.SONG ||
+                itemType === LibraryItem.PLAYLIST_SONG ||
+                itemType === LibraryItem.QUEUE_SONG
+            ) {
                 player.addToQueueByData(songs || [], playType);
             } else {
                 player.addToQueueByFetch(serverId, ids, itemType, playType);
diff --git a/src/renderer/features/context-menu/menus/playlist-song-context-menu.tsx b/src/renderer/features/context-menu/menus/playlist-song-context-menu.tsx
index 2647b95a9..126534335 100644
--- a/src/renderer/features/context-menu/menus/playlist-song-context-menu.tsx
+++ b/src/renderer/features/context-menu/menus/playlist-song-context-menu.tsx
@@ -26,19 +26,19 @@ export const PlaylistSongContextMenu = ({ items, type }: PlaylistSongContextMenu
 
     return (
         <ContextMenu.Content
-            bottomStickyContent={<ContextMenuPreview items={items} itemType={LibraryItem.SONG} />}
+            bottomStickyContent={<ContextMenuPreview items={items} itemType={type} />}
         >
-            <PlayAction ids={ids} itemType={LibraryItem.SONG} />
+            <PlayAction ids={ids} itemType={type} songs={items} />
             <ContextMenu.Divider />
             <RemoveFromPlaylistAction items={items} />
             <ContextMenu.Divider />
-            <AddToPlaylistAction items={ids} itemType={LibraryItem.SONG} />
+            <AddToPlaylistAction items={ids} itemType={type} />
             <ContextMenu.Divider />
-            <SetFavoriteAction ids={ids} itemType={LibraryItem.SONG} />
-            <SetRatingAction ids={ids} itemType={LibraryItem.SONG} />
+            <SetFavoriteAction ids={ids} itemType={type} />
+            <SetRatingAction ids={ids} itemType={type} />
             <ContextMenu.Divider />
             <DownloadAction ids={ids} />
-            <ShareAction ids={ids} itemType={LibraryItem.SONG} />
+            <ShareAction ids={ids} itemType={type} />
             <ContextMenu.Divider />
             <GoToAction items={items} />
             <ContextMenu.Divider />