diff --git a/RetroFE/Source/Graphics/Component/Component.cpp b/RetroFE/Source/Graphics/Component/Component.cpp
index ede499b..e196c82 100644
--- a/RetroFE/Source/Graphics/Component/Component.cpp
+++ b/RetroFE/Source/Graphics/Component/Component.cpp
@@ -93,7 +93,7 @@ void Component::triggerEvent(std::string event, int menuIndex)
 {
     animationRequestedType_ = event;
     animationRequested_     = true;
-    menuIndex_              = menuIndex;
+    menuIndex_              = (menuIndex > 0 ? menuIndex : 0);
 }
 
 void Component::setPlaylist(std::string name)
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index fd03b12..da7ab3f 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 = "17";
+std::string retrofe_version_build = "18";
 
 
 std::string Version::getString()