diff --git a/containments/homescreen/package/contents/ui/launcher/private/DragGestureHandler.qml b/containments/homescreen/package/contents/ui/launcher/private/DragGestureHandler.qml
index 01a1c4fa..1a34e2bf 100644
--- a/containments/homescreen/package/contents/ui/launcher/private/DragGestureHandler.qml
+++ b/containments/homescreen/package/contents/ui/launcher/private/DragGestureHandler.qml
@@ -40,7 +40,7 @@ DragHandler {
                 root.appDrawer.offset = -translation.y;
             }
             if (__scrollDirection !== DragGestureHandler.Vertical) {
-                mainFlickable.contentX = Math.max(0, __initialMainFlickableX - translation.x);
+                mainFlickable.contentX = Math.min((mainFlickable.width * mainFlickable.totalPages) - mainFlickable.width, Math.max(0, __initialMainFlickableX - translation.x))
             }
         }
     }