diff --git a/es-core/src/components/ScrollableContainer.cpp b/es-core/src/components/ScrollableContainer.cpp
index af7f1b57f..ffad86046 100644
--- a/es-core/src/components/ScrollableContainer.cpp
+++ b/es-core/src/components/ScrollableContainer.cpp
@@ -113,7 +113,8 @@ void ScrollableContainer::update(int deltaTime)
     if (adjustedAutoScrollSpeed != 0) {
         mAutoScrollAccumulator += deltaTime;
         while (mAutoScrollAccumulator >= adjustedAutoScrollSpeed) {
-            mScrollPos += mScrollDir;
+            if (contentSize.y() > mSize.y())
+                mScrollPos += mScrollDir;
             mAutoScrollAccumulator -= adjustedAutoScrollSpeed;
         }
     }