diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 0ada1b1..dc2637a 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -409,7 +409,17 @@ void RetroFE::run( )
         case RETROFE_ENTER:
             if ( currentPage_->isIdle( ) )
             {
-                state = RETROFE_IDLE;
+                bool startCollectionEnter = false;
+                config_.getProperty( "startCollectionEnter", startCollectionEnter );
+                nextPageItem_ = currentPage_->getSelectedItem( );
+                if ( !splashMode && startCollectionEnter && !nextPageItem_->leaf )
+                {
+                    state = RETROFE_NEXT_PAGE_REQUEST;
+                }
+                else
+                {
+                    state = RETROFE_IDLE;
+                }
             }
             break;
 
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 04ee8f4..065aa23 100644
--- a/RetroFE/Source/Version.cpp
+++ b/RetroFE/Source/Version.cpp
@@ -21,7 +21,7 @@
 
 std::string retrofe_version_major = "0";
 std::string retrofe_version_minor = "9";
-std::string retrofe_version_build = "5";
+std::string retrofe_version_build = "6";
 
 
 std::string Version::getString( )