diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 5cb7e0b..fe8278a 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -346,11 +346,8 @@ void RetroFE::run()
             break;
 
         case RETROFE_HIGHLIGHT_EXIT:
-            if ( processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
-            {
-                state = RETROFE_HIGHLIGHT_ENTER;
-            }
-            else if (currentPage_->isGraphicsIdle() && currentPage_->isMenuScrolling())
+            if ((processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST) ||
+                (currentPage_->isGraphicsIdle() && currentPage_->isMenuScrolling()))
             {
                 currentPage_->onNewItemSelected();
                 currentPage_->highlightEnter();