diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index d842f2d954..2dd3b4de09 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -166,6 +166,12 @@ public class AllAppsView extends RSSurfaceView
 
         long startTime = SystemClock.uptimeMillis();
 
+        if (mRS != null) {
+            destroyRenderScript();
+            mRS = null;
+            mRollo = null;
+        }
+
         mRS = createRenderScript(true);
         mRollo = new RolloRS();
         mRollo.init(getResources(), w, h);