diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 3c4ea77..4c98101 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -806,7 +806,7 @@
         private Canvas mSelectionCanvas;
 
         boolean mHasSurface = false;
-        private boolean mAppsDirty = false;
+        private boolean mAppsDirty = true;
 
         Params mParams;
         State mState;
@@ -1053,7 +1053,7 @@
 
         void dirtyCheck() {
             if (mHasSurface) {
-                if (mAppsDirty) {
+                if (mAppsDirty && mAllAppsList != null) {
                     for (int i=0; i < mState.iconCount; i++) {
                         uploadAppIcon(i, mAllAppsList.get(i));
                     }