diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 8cc0a88..e974fe9 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -447,7 +447,8 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
     if (!input_.keystate(UserInput::KeyCodePageUp) &&
     !input_.keystate(UserInput::KeyCodePageDown) &&
     !input_.keystate(UserInput::KeyCodeLetterUp) &&
-    !input_.keystate(UserInput::KeyCodeLetterDown))
+    !input_.keystate(UserInput::KeyCodeLetterDown) &&
+    !input_.keystate(UserInput::KeyCodeNextPlaylist))
     {
         keyLastTime_ = 0;
         keyDelayTime_= 0.3f;
@@ -475,6 +476,10 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
         {
             page->letterScroll(Page::ScrollDirectionForward);
         }
+        if(input_.keystate(UserInput::KeyCodeNextPlaylist))
+        {
+            page->nextPlaylist();
+        }
     }
 
     if (input_.keystate(UserInput::KeyCodeAdminMode))
@@ -512,10 +517,6 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
             }
         }
     }
-    if(input_.keystate(UserInput::KeyCodeNextPlaylist) && page->isMenuIdle())
-    {
-        page->nextPlaylist();
-    }
 
     if (input_.keystate(UserInput::KeyCodeBack) && page->isMenuIdle())
     {