diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index a4891dafb1..7f6e8ff735 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -179,6 +179,8 @@ public class AllAppsView extends RSSurfaceView
     public void surfaceDestroyed(SurfaceHolder holder) {
         super.surfaceDestroyed(holder);
         mRollo.mHasSurface = false;
+        // Without this, we leak mMessageCallback which leaks the context.
+        mRS.mMessageCallback = null;
     }
 
     @Override