diff --git a/RetroFE/Source/Execute/AttractMode.cpp b/RetroFE/Source/Execute/AttractMode.cpp
index fdebc36..fa0d06e 100644
--- a/RetroFE/Source/Execute/AttractMode.cpp
+++ b/RetroFE/Source/Execute/AttractMode.cpp
@@ -49,6 +49,12 @@ void AttractMode::update(float dt, Page &page)
     {
         page.setScrolling(Page::ScrollDirectionForward);
 
+        if (page.isMenuIdle())
+        {
+            page.scroll(true);
+            page.updateScrollPeriod();
+        }
+
         if(elapsedTime_ > activeTime_)
         {
             elapsedTime_ = 0;
diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index a39c460..278b466 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -678,6 +678,7 @@ RetroFE::RETROFE_STATE RetroFE::processUserInput(Page *page)
         input_.update(e);
         if(e.type == SDL_KEYDOWN && !e.key.repeat)
         {
+            attract_.reset();
             break;
         }
     }