diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index e8c2795..4516e0d 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -351,9 +351,12 @@ void RetroFE::run()
             break;
 
         case RETROFE_HIGHLIGHT_EXIT:
-            if ((processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST) ||
-                (currentPage_->isGraphicsIdle() && currentPage_->isMenuScrolling()) ||
-                (currentPage_->isIdle()))
+            if ( processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
+            {
+                state = RETROFE_HIGHLIGHT_REQUEST;
+            }
+            else if ((currentPage_->isGraphicsIdle() && currentPage_->isMenuScrolling()) ||
+                     (currentPage_->isIdle()))
             {
                 currentPage_->onNewItemSelected();
                 state = RETROFE_HIGHLIGHT_LOAD_ART;
@@ -361,9 +364,12 @@ void RetroFE::run()
             break;
 
         case RETROFE_HIGHLIGHT_LOAD_ART:
-            if ((processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST) ||
-                (currentPage_->isGraphicsIdle() && currentPage_->isMenuScrolling()) ||
-                (currentPage_->isIdle()))
+            if ( processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
+            {
+                state = RETROFE_HIGHLIGHT_REQUEST;
+            }
+            else if ((currentPage_->isGraphicsIdle() && currentPage_->isMenuScrolling()) ||
+                     (currentPage_->isIdle()))
             {
                 currentPage_->highlightEnter();
                 state = RETROFE_HIGHLIGHT_ENTER;
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 9d8ea4c..1f7870a 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 = "7";
-std::string retrofe_version_build = "10";
+std::string retrofe_version_build = "11";
 
 
 std::string Version::getString()