diff --git a/src/library/trackset/playlistfeature.cpp b/src/library/trackset/playlistfeature.cpp
index 0d7e4945622f..d4d67b1d4732 100644
--- a/src/library/trackset/playlistfeature.cpp
+++ b/src/library/trackset/playlistfeature.cpp
@@ -98,13 +98,26 @@ void PlaylistFeature::onRightClickChild(
     m_pLockPlaylistAction->setText(locked ? tr("Unlock") : tr("Lock"));
 
     QMenu menu(m_pSidebarWidget);
+
+    QMenu* moreMenu;
+    bool showMoreMenu = true;
+    if (showMoreMenu) {
+        moreMenu = new QMenu(&menu);
+        moreMenu->setTitle(tr("More"));
+        moreMenu->setObjectName("MoreMenu");
+    } else {
+        moreMenu = &menu;
+    }
+
     menu.addAction(m_pCreatePlaylistAction);
     menu.addSeparator();
+
     // TODO If playlist is selected and has more than one track selected
     // show "Shuffle selected tracks", else show "Shuffle playlist"?
-    menu.addAction(m_pShufflePlaylistAction);
-    menu.addAction(m_pOrderByCurrentPosAction);
-    menu.addSeparator();
+    moreMenu->addAction(m_pShufflePlaylistAction);
+    moreMenu->addAction(m_pOrderByCurrentPosAction);
+    moreMenu->addSeparator();
+
     menu.addAction(m_pRenamePlaylistAction);
     menu.addAction(m_pDuplicatePlaylistAction);
     menu.addAction(m_pDeletePlaylistAction);
@@ -114,13 +127,18 @@ void PlaylistFeature::onRightClickChild(
     menu.addAction(m_pAddToAutoDJTopAction);
     menu.addAction(m_pAddToAutoDJReplaceAction);
     menu.addSeparator();
-    menu.addAction(m_pAnalyzePlaylistAction);
-    menu.addSeparator();
-    menu.addAction(m_pImportPlaylistAction);
-    menu.addAction(m_pExportPlaylistAction);
-    menu.addAction(m_pExportTrackFilesAction);
+
+    if (showMoreMenu) {
+        menu.addMenu(moreMenu);
+    }
+
+    moreMenu->addAction(m_pAnalyzePlaylistAction);
+    moreMenu->addSeparator();
+    moreMenu->addAction(m_pImportPlaylistAction);
+    moreMenu->addAction(m_pExportPlaylistAction);
+    moreMenu->addAction(m_pExportTrackFilesAction);
 #ifdef __ENGINEPRIME__
-    menu.addAction(m_pExportPlaylistToEngineAction);
+    moreMenu->addAction(m_pExportPlaylistToEngineAction);
 #endif
     menu.exec(globalPos);
 }