diff --git a/es-core/src/components/IList.h b/es-core/src/components/IList.h
index ff0fd307e..e8300ee6d 100644
--- a/es-core/src/components/IList.h
+++ b/es-core/src/components/IList.h
@@ -101,6 +101,9 @@ public:
 
     void stopScrolling()
     {
+        if (mScrollVelocity == 0)
+            return;
+
         mTitleOverlayOpacity = 0.0f;
 
         listInput(0);
diff --git a/es-core/src/components/primary/TextListComponent.h b/es-core/src/components/primary/TextListComponent.h
index 1366629d2..3bf27b1f0 100644
--- a/es-core/src/components/primary/TextListComponent.h
+++ b/es-core/src/components/primary/TextListComponent.h
@@ -282,7 +282,7 @@ template <typename T> void TextListComponent<T>::update(int deltaTime)
 {
     List::listUpdate(deltaTime);
 
-    if (mWindow->isScreensaverActive() || !mWindow->getAllowTextScrolling())
+    if (isScrolling() && (mWindow->isScreensaverActive() || !mWindow->getAllowTextScrolling()))
         List::stopScrolling();
 
     if (!isScrolling() && size() > 0) {