diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index ba4a9f9..d0885aa 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -774,7 +774,9 @@ void RetroFE::run( )
                 {
                     currentPage_->setScrolling(Page::ScrollDirectionIdle); // Stop scrolling
                     nextPageItem_ = currentPage_->getSelectedItem( );
-                    if ( currentPage_->getSelectedItem( )->leaf ) // Current selection is a game
+                    bool enterOnCollection = true;
+                    config_.getProperty( "enterOnCollection", enterOnCollection );
+                    if ( currentPage_->getSelectedItem( )->leaf || !enterOnCollection ) // Current selection is a game or enterOnCollection is not set
                     {
                         state = RETROFE_HIGHLIGHT_REQUEST;
                     }
@@ -931,7 +933,9 @@ void RetroFE::run( )
                 {
                     currentPage_->setScrolling(Page::ScrollDirectionIdle); // Stop scrolling
                     nextPageItem_ = currentPage_->getSelectedItem( );
-                    if ( currentPage_->getSelectedItem( )->leaf ) // Current selection is a game
+                    bool enterOnCollection = true;
+                    config_.getProperty( "enterOnCollection", enterOnCollection );
+                    if ( currentPage_->getSelectedItem( )->leaf || !enterOnCollection ) // Current selection is a game or enterOnCollection is not set
                     {
                         state = RETROFE_HIGHLIGHT_REQUEST;
                     }
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index e233708..09aa89b 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 = "10";
+std::string retrofe_version_build = "11";
 
 
 std::string Version::getString( )