diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index bd89e0b..7dde45b 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -343,6 +343,10 @@ void RetroFE::run()
                     {
                         currentPage_->selectPlaylist("favorites"); // Switch to favorites playlist
                     }
+                    else
+                    {
+                        currentPage_->selectPlaylist("all"); // Switch to all games playlist
+                    }
 
                     currentPage_->onNewItemSelected();
                     currentPage_->reallocateMenuSpritePoints();
@@ -487,6 +491,10 @@ void RetroFE::run()
                 {
                   currentPage_->selectPlaylist("favorites"); // Switch to favorites playlist
                 }
+                else
+                {
+                  currentPage_->selectPlaylist("all"); // Switch to all games playlist
+                }
 
                 if(rememberMenu && lastMenuOffsets_.find(nextPageName) != lastMenuOffsets_.end())
                 {
@@ -581,6 +589,10 @@ void RetroFE::run()
                 {
                   currentPage_->selectPlaylist("favorites"); // Switch to favorites playlist
                 }
+                else
+                {
+                  currentPage_->selectPlaylist("all"); // Switch to all games playlist
+                }
 
                 if(rememberMenu && lastMenuOffsets_.find(currentPage_->getCollectionName()) != lastMenuOffsets_.end())
                 {
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 154dc3c..2862dc1 100644
--- a/RetroFE/Source/Version.cpp
+++ b/RetroFE/Source/Version.cpp
@@ -20,7 +20,7 @@
 
 std::string retrofe_version_major = "0";
 std::string retrofe_version_minor = "8";
-std::string retrofe_version_build = "1";
+std::string retrofe_version_build = "2";
 
 
 std::string Version::getString()