diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 9e8bf3a..dd11ca9 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -348,9 +348,15 @@ void RetroFE::run()
         case RETROFE_HIGHLIGHT_EXIT:
             if ( processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
             {
-                state = RETROFE_HIGHLIGHT_REQUEST;
+                state = RETROFE_HIGHLIGHT_ENTER;
             }
-            else if (currentPage_->isGraphicsIdle())
+            else if (currentPage_->isGraphicsIdle() && currentPage_->isMenuScrolling())
+            {
+                currentPage_->onNewItemSelected();
+                currentPage_->highlightEnter();
+                state = RETROFE_HIGHLIGHT_ENTER;
+            }
+            else if (currentPage_->isIdle())
             {
                 currentPage_->onNewItemSelected();
                 currentPage_->highlightEnter();