diff --git a/containments/homescreen/package/contents/ui/launcher/FlickablePages.qml b/containments/homescreen/package/contents/ui/launcher/FlickablePages.qml
index 39999cd2..bc1331f7 100644
--- a/containments/homescreen/package/contents/ui/launcher/FlickablePages.qml
+++ b/containments/homescreen/package/contents/ui/launcher/FlickablePages.qml
@@ -47,7 +47,7 @@ Flickable {
     onFlickStarted: cancelEditModeForItemsRequested()
     onFlickEnded: cancelEditModeForItemsRequested()
 
-    onCurrentIndexChanged: contentX = width * currentIndex;
+    //onCurrentIndexChanged: contentX = width * currentIndex;
     onContentXChanged: mainFlickable.currentIndex = Math.floor(contentX / width)
 
 
diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index aad6e80b..1629f562 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -144,6 +144,17 @@ FocusScope {
                         appletsLayout.defaultItemHeight)
                     );
                     launcherDragManager.hideSpacer();
+
+                    //SCROLL LEFT
+                    if (event.x < units.gridUnit) {
+                        mainFlickable.scrollLeft();
+                    //SCROLL RIGHT
+                    } else if (event.x > mainFlickable.width - units.gridUnit) {
+                        mainFlickable.scrollRight();
+                    //DON't SCROLL
+                    } else {
+                        mainFlickable.stopScroll();
+                    }
                 }
             }