diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index 3f851153..33130398 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -43,7 +43,7 @@ namespace Vocaluxe.Screens
         // Version number for theme files. Increment it, if you've changed something on the theme files!
         protected override int _ScreenVersion
         {
-            get { return 9; }
+            get { return 10; }
         }
 
         private const string _TextCategory = "TextCategory";
@@ -217,6 +217,11 @@ namespace Vocaluxe.Screens
                     keyEvent.Handled = true;
                     return true;
                 }
+                if (keyEvent.Key == Keys.Enter && _Playlist.isButtonPlaylistListSelected())
+                {
+                    _TogglePlaylistFilter();
+                    return true;
+                }
             }
 
             // Playlist selection is handled below not in base!
@@ -506,6 +511,11 @@ namespace Vocaluxe.Screens
                         _SongMenu.SmallView = false;
                     return true;
                 }
+                if (mouseEvent.LB && _Playlist.isButtonPlaylistListSelected())
+                {
+                    _TogglePlaylistFilter();
+                    return true;
+                }
             }
             else if (CHelper.IsInBounds(_SongMenu.Rect, mouseEvent))
             {