diff --git a/RetroFE/Source/Graphics/Page.cpp b/RetroFE/Source/Graphics/Page.cpp
index 82bf57f..7f0423f 100644
--- a/RetroFE/Source/Graphics/Page.cpp
+++ b/RetroFE/Source/Graphics/Page.cpp
@@ -1096,8 +1096,9 @@ void Page::cyclePlaylist(std::vector<std::string> list)
     // Current playlist found; switch to the next found playlist in the list
     else
     {
-        for(;; ++it)
+        for(;;)
         {
+            ++it;
             if (it == list.end()) it = list.begin(); // wrap
             selectPlaylist( *it );
             if (*it == getPlaylistName())
diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 30abe78..1242162 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -1000,6 +1000,7 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput( Page *page )
             !input_.keystate(UserInput::KeyCodeFavPlaylist) &&
             !input_.keystate(UserInput::KeyCodeNextPlaylist) &&
             !input_.keystate(UserInput::KeyCodePrevPlaylist) &&
+            !input_.keystate(UserInput::KeyCodeCyclePlaylist) &&
             !input_.keystate(UserInput::KeyCodeAddPlaylist) &&
             !input_.keystate(UserInput::KeyCodeRemovePlaylist) &&
             !input_.keystate(UserInput::KeyCodeRandom) &&