diff --git a/RetroFE/Source/Graphics/Component/Component.cpp b/RetroFE/Source/Graphics/Component/Component.cpp
index 3b81db2..ae934a2 100644
--- a/RetroFE/Source/Graphics/Component/Component.cpp
+++ b/RetroFE/Source/Graphics/Component/Component.cpp
@@ -177,7 +177,7 @@ void Component::update(float dt)
 {
     elapsedTweenTime_ += dt;
     highlightExitComplete = false;
-    if(isHidden() || isWaiting() || (isIdle() && exitRequested))
+    if(isHidden() || isWaiting() || (isIdle() && (exitRequested || menuExitRequested || enterRequested || menuEnterRequested)))
     {
         currentTweenComplete_ = true;
     }