1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3a464e0ae..bba10a118 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2261,8 +2261,8 @@ public class Workspace extends SmoothPagedView
 
         if (oldStateIsOverview) {
             disableFreeScroll();
-        } else if (stateIsOverview) {
-            enableFreeScroll();
+        } else if (stateIsOverview){
+            updateFreescrollBounds();
         }
 
         if (state != State.NORMAL) {
@@ -4895,4 +4895,10 @@ public class Workspace extends SmoothPagedView
     public boolean getHideIconLables() {
         return mHideIconLabels;
     }
+
+    @Override
+    public void scrollTo(int x, int y) {
+        mEnforceRealBounds = isInOverviewMode();
+        super.scrollTo(x, y);
+    }
 }