1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 1fd4b1bc0..34647903e 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2176,12 +2176,15 @@ public class Workspace extends SmoothPagedView
     }
 
     public void exitOverviewMode(int snapPage, boolean animated) {
+        ((SlidingUpPanelLayout) mLauncher.getOverviewPanel()).collapsePane();
+
         enableOverviewMode(false, snapPage, animated);
     }
 
     private void enableOverviewMode(boolean enable, int snapPage, boolean animated) {
-        //Check to see if Settings need to taken
+        // Check to see if new Settings need to taken
         reloadSettings();
+        mLauncher.updateGridIfNeeded();
 
         State finalState = Workspace.State.OVERVIEW;
         if (!enable) {
@@ -2360,6 +2363,9 @@ public class Workspace extends SmoothPagedView
         if (snapPage == -1) {
             snapPage = getPageNearestToCenterOfScreen();
         }
+        if (hasCustomContent()) {
+            snapPage = Math.max(1, snapPage);
+        }
         snapToPage(snapPage, duration, mZoomInInterpolator);
 
         for (int i = 0; i < getChildCount(); i++) {