diff --git a/res/layout-xlarge/all_apps_tabbed.xml b/res/layout-xlarge/all_apps_tabbed.xml
new file mode 100644
index 0000000..a5f3d6f
--- /dev/null
+++ b/res/layout-xlarge/all_apps_tabbed.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher2.AllAppsTabbed xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.android.launcher2.AllApps2D
+                android:id="@+id/all_apps_2d"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="2dip">
+                <GridView android:id="@+id/all_apps_2d_grid"
+                    android:tag="all_apps_2d_grid"
+                    android:scrollbars="none"
+                    android:drawSelectorOnTop="false"
+                    android:listSelector="@drawable/grid_selector"
+                    android:verticalSpacing="10dip"
+                    android:numColumns="4"
+                    android:fadingEdgeLength="0dip"
+                    android:cacheColorHint="#00000000"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginBottom="@dimen/button_bar_height"
+                    android:layout_marginTop="8dip"
+                    android:nextFocusDown="@+id/all_apps_2d_home"
+                    android:nextFocusUp="@null"
+                    android:nextFocusLeft="@null"
+                    android:nextFocusRight="@null" />
+            </com.android.launcher2.AllApps2D>
+        </FrameLayout>
+    </LinearLayout>
+</com.android.launcher2.AllAppsTabbed>
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 72cd796..61457bf 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -22,7 +22,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/all_apps" />
+    <include
+        layout="@layout/all_apps_tabbed"
+        android:id="@+id/all_apps_view"
+        android:layout_width="match_parent"
+        android:layout_height="500dip"
+        android:layout_gravity="top"/>
 
     <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
@@ -39,8 +44,6 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-
-
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
         android:layout_width="wrap_content"
@@ -86,37 +89,37 @@
         android:layout_height="200dip"
         android:layout_gravity="bottom"
         android:visibility="gone">
-      <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-         <TabWidget
-           android:id="@android:id/tabs"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content" />
-         <FrameLayout
-           android:id="@android:id/tabcontent"
-           android:background="#ff000000"
-           android:layout_width="match_parent"
-           android:layout_height="match_parent">
-           <com.android.launcher2.WidgetChooser
-             android:id="@+id/widget_chooser"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-           <com.android.launcher2.FolderChooser
-             android:id="@+id/folder_chooser"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-           <com.android.launcher2.ShortcutChooser
-             android:id="@+id/shortcut_chooser"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" />
-           <TextView
-             android:id="@+id/wallpaperstab"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:text="@string/wallpapers_temp_tab_text" />
-          </FrameLayout>
-        </LinearLayout>
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TabWidget
+                android:id="@android:id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <FrameLayout
+                android:id="@android:id/tabcontent"
+                android:background="#ff000000"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <com.android.launcher2.WidgetChooser
+                    android:id="@+id/widget_chooser"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
+                    <com.android.launcher2.FolderChooser
+                        android:id="@+id/folder_chooser"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                    <com.android.launcher2.ShortcutChooser
+                        android:id="@+id/shortcut_chooser"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent" />
+                    <TextView
+                        android:id="@+id/wallpaperstab"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/wallpapers_temp_tab_text" />
+             </FrameLayout>
+          </LinearLayout>
     </TabHost>
 </com.android.launcher2.DragLayer>