diff --git a/es-core/src/components/ComponentList.cpp b/es-core/src/components/ComponentList.cpp
index d05047e79..31eba491a 100644
--- a/es-core/src/components/ComponentList.cpp
+++ b/es-core/src/components/ComponentList.cpp
@@ -208,7 +208,9 @@ void ComponentList::updateCameraOffset()
             i++;
         }
 
-        if (mCameraOffset < oldCameraOffset)
+        if (mCameraOffset < oldCameraOffset &&
+            (oldCameraOffset > mSelectorBarOffset ||
+             mScrollIndicatorStatus != ComponentList::SCROLL_NONE))
             mBottomCameraOffset = false;
 
         if (mCameraOffset < 0.0f)