diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9da1fbb..b02c3c6 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2490,11 +2490,15 @@
      */
     protected void onClickAllAppsButton(View v) {
         if (LOGD) Log.d(TAG, "onClickAllAppsButton");
+
+        mWorkspace.setWallpaperDimension();
+        /*
         if (isAllAppsVisible()) {
             showWorkspace(true);
         } else {
             showAllApps(true, AppsCustomizePagedView.ContentType.Applications, false);
         }
+        */
     }
 
     /**
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index b76beda..76f0bd7 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -460,7 +460,7 @@
         mFlingThresholdVelocity = (int) (FLING_THRESHOLD_VELOCITY * mDensity);
 
         // Set the wallpaper dimensions when Launcher starts up
-        setWallpaperDimension();
+        //setWallpaperDimension();
     }
 
     private void setupLayoutTransition() {
@@ -1269,7 +1269,7 @@
         return mCustomContentCallbacks;
     }
 
-    protected void setWallpaperDimension() {
+    public void setWallpaperDimension() {
         new AsyncTask<Void, Void, Void>() {
             public Void doInBackground(Void ... args) {
                 String spKey = WallpaperCropActivity.getSharedPreferencesKey();
@@ -1764,7 +1764,7 @@
         // Update wallpaper dimensions if they were changed since last onResume
         // (we also always set the wallpaper dimensions in the constructor)
         if (LauncherAppState.getInstance().hasWallpaperChangedSinceLastCheck()) {
-            setWallpaperDimension();
+            //setWallpaperDimension();
         }
         mWallpaperIsLiveWallpaper = mWallpaperManager.getWallpaperInfo() != null;
         // Force the wallpaper offset steps to be set again, because another app might have changed
