diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 4516e0d..351d249 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -364,7 +364,7 @@ void RetroFE::run()
             break;
 
         case RETROFE_HIGHLIGHT_LOAD_ART:
-            if ( processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
+            if ( currentPage_->isMenuIdle() && processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
             {
                 state = RETROFE_HIGHLIGHT_REQUEST;
             }
@@ -377,7 +377,7 @@ void RetroFE::run()
             break;
 
         case RETROFE_HIGHLIGHT_ENTER:
-            if ( processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
+            if ( currentPage_->isMenuIdle() && processUserInput(currentPage_) == RETROFE_HIGHLIGHT_REQUEST)
             {
                 state = RETROFE_HIGHLIGHT_REQUEST;
             }
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index fe3cbff..b35b9ff 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 = "14";
+std::string retrofe_version_build = "15";
 
 
 std::string Version::getString()