diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst
index ec619af0ab211..44ed7eb53b002 100644
--- a/DOCS/man/osc.rst
+++ b/DOCS/man/osc.rst
@@ -31,17 +31,17 @@ The Interface
 pl prev
     =============   ================================================
     left-click      play previous file in playlist
-    right-click     show the playlist
     shift+L-click   show the playlist
     middle-click    show the playlist
+    right-click     open the playlist selector
     =============   ================================================
 
 pl next
     =============   ================================================
     left-click      play next file in playlist
-    right-click     show the playlist
     shift+L-click   show the playlist
     middle-click    show the playlist
+    right-click     open the playlist selector
     =============   ================================================
 
 title
@@ -505,13 +505,13 @@ clicked. ``mbtn_mid`` commands are also triggered with ``shift+mbtn_left``.
 
 ``playlist_prev_mbtn_mid_command=show-text ${playlist} 3000``
 
-``playlist_prev_mbtn_right_command=show-text ${playlist} 3000``
+``playlist_prev_mbtn_right_command=script-binding select/select-playlist; script-message-to osc osc-hide``
 
 ``playlist_next_mbtn_left_command=playlist-next; show-text ${playlist} 3000``
 
 ``playlist_next_mbtn_mid_command=show-text ${playlist} 3000``
 
-``playlist_next_mbtn_right_command=show-text ${playlist} 3000``
+``playlist_next_mbtn_right_command=script-binding select/select-playlist; script-message-to osc osc-hide``
 
 ``title_mbtn_left_command=script-binding stats/display-page-5``
 
diff --git a/etc/restore-osc-bindings.conf b/etc/restore-osc-bindings.conf
index 409f44493de9f..5a6021936b495 100644
--- a/etc/restore-osc-bindings.conf
+++ b/etc/restore-osc-bindings.conf
@@ -17,6 +17,9 @@ chapter_prev_mbtn_left_command=no-osd add chapter -1; show-text ${chapter-list}
 chapter_next_mbtn_left_command=no-osd add chapter 1; show-text ${chapter-list} 3000
 
 # restore behavior before select.lua usage
+playlist_prev_mbtn_left_command=show-text ${playlist} 3000
+playlist_next_mbtn_left_command=show-text ${playlist} 3000
+
 title=${media-title}
 title_mbtn_left_command=show-text "${!playlist-count==1:[${playlist-pos-1}/${playlist-count}] }${media-title}"
 title_mbtn_right_command=show-text ${filename}
diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index 1b3b6eb0c9c02..88cff2b04c9af 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -73,11 +73,11 @@ local user_opts = {
     -- luacheck: max line length
     playlist_prev_mbtn_left_command = "playlist-prev",
     playlist_prev_mbtn_mid_command = "show-text ${playlist} 3000",
-    playlist_prev_mbtn_right_command = "show-text ${playlist} 3000",
+    playlist_prev_mbtn_right_command = "script-binding select/select-playlist; script-message-to osc osc-hide",
 
     playlist_next_mbtn_left_command = "playlist-next",
     playlist_next_mbtn_mid_command = "show-text ${playlist} 3000",
-    playlist_next_mbtn_right_command = "show-text ${playlist} 3000",
+    playlist_next_mbtn_right_command = "script-binding select/select-playlist; script-message-to osc osc-hide",
 
     title_mbtn_left_command = "script-binding stats/display-page-5",
     title_mbtn_mid_command = "show-text ${filename}",