1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 5434e720f..18030b451 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -290,6 +290,10 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
      * Sets the search bar that shows above the a-z list.
      */
     public void setSearchBarController(AllAppsSearchBarController searchController) {
+        if (searchController == null) {
+            mSearchBarController = null;
+            return;
+        }
         if (mSearchBarController != null) {
             throw new RuntimeException("Expected search bar controller to only be set once");
         }