diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java
index 6a13a13850..216e68dcca 100644
--- a/src/com/android/launcher3/FolderPagedView.java
+++ b/src/com/android/launcher3/FolderPagedView.java
@@ -485,10 +485,12 @@ public class FolderPagedView extends PagedView implements Folder.FolderContent {
             mPageIndicator.setVisibility(View.VISIBLE);
             mSortButton.setVisibility(View.VISIBLE);
             mFolder.mFolderName.setGravity(Gravity.START);
+            setEnableOverscroll(true);
         } else {
             mPageIndicator.setVisibility(View.GONE);
             mSortButton.setVisibility(View.GONE);
             mFolder.mFolderName.setGravity(Gravity.CENTER_HORIZONTAL);
+            setEnableOverscroll(false);
         }
     }
 
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index e7049e2acf..158a30c403 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1702,7 +1702,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
         setEnableOverscroll(!freeScroll);
     }
 
-    private void setEnableOverscroll(boolean enable) {
+    protected void setEnableOverscroll(boolean enable) {
         mAllowOverScroll = enable;
     }