diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 3f56b45..f0564ca 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -34,6 +34,7 @@
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        launcher:defaultScreen="2"
         launcher:canonicalDeviceWidth="8"
         launcher:canonicalDeviceHeight="4">
 
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 8102d19..1de318f 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2147,8 +2147,7 @@
 
     void onWorkspaceUnshrink() {
         if (isAllAppsVisible()) {
-            // TODO: Make a smoother transition here
-            closeAllApps(false);
+            closeAllApps(true);
         }
         if (isCustomizationDrawerVisible()) {
             hideCustomizationDrawer();
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 3e52d7f..5200dbc 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -804,7 +804,10 @@
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
-            if (mLauncher.isWorkspaceLocked() || mLauncher.isAllAppsVisible()) {
+            // (In XLarge mode, the workspace is shrunken below all apps, and responds to taps
+            // ie when you click on a mini-screen, it zooms back to that screen)
+            if (mLauncher.isWorkspaceLocked() ||
+                    (!LauncherApplication.isScreenXLarge() && mLauncher.isAllAppsVisible())) {
                 return false;
             }
         }
@@ -815,7 +818,10 @@
     public boolean onInterceptTouchEvent(MotionEvent ev) {
         final boolean workspaceLocked = mLauncher.isWorkspaceLocked();
         final boolean allAppsVisible = mLauncher.isAllAppsVisible();
-        if (workspaceLocked || allAppsVisible) {
+
+        // (In XLarge mode, the workspace is shrunken below all apps, and responds to taps
+        // ie when you click on a mini-screen, it zooms back to that screen)
+        if (workspaceLocked || (!LauncherApplication.isScreenXLarge() && allAppsVisible)) {
             return false; // We don't want the events.  Let them fall through to the all apps view.
         }