1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8925a72a2..37635da0c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -816,6 +816,7 @@ public class Launcher extends Activity
                 // When the user has granted permission to bind widgets, we should check to see if
                 // we can inflate the default search bar widget.
                 getOrCreateQsbBar();
+                showWorkspace(false);
             }
             return;
         } else if (requestCode == REQUEST_PICK_WALLPAPER) {
@@ -3687,6 +3688,10 @@ public class Launcher extends Activity
         boolean changed = mState != State.WORKSPACE ||
                 mWorkspace.getState() != Workspace.State.NORMAL;
         if (changed) {
+            // Close overview mode if open
+            if (mWorkspace.isInOverviewMode()) {
+                mWorkspace.exitOverviewMode();
+            }
             mWorkspace.setVisibility(View.VISIBLE);
             mStateTransitionAnimation.startAnimationToWorkspace(mState, mWorkspace.getState(),
                     Workspace.State.NORMAL, snapToPage, animated, onCompleteRunnable);