1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
index 38daadd8a..66a85188e 100644
--- a/src/com/android/launcher3/SearchDropTargetBar.java
+++ b/src/com/android/launcher3/SearchDropTargetBar.java
@@ -217,7 +217,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
         // Animate out the QSB search bar, and animate in the drop target bar
         prepareStartAnimation(mDropTargetBar);
         mDropTargetBarAnim.start();
-        if (!isAnyFolderOpen() && (!mIsSearchBarHidden || mQSBSearchBar.getAlpha() > 0f)) {
+        if (!isAnyFolderOpen() && (!mIsSearchBarHidden ||
+                (mQSBSearchBar != null && mQSBSearchBar.getAlpha() > 0f))) {
             prepareStartAnimation(mQSBSearchBar);
             mQSBSearchBarAnim.start();
         }
@@ -240,7 +241,8 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
             // Restore the QSB search bar, and animate out the drop target bar
             prepareStartAnimation(mDropTargetBar);
             mDropTargetBarAnim.reverse();
-            if (!isAnyFolderOpen() && (!mIsSearchBarHidden || mQSBSearchBar.getAlpha() < 1f)) {
+            if (!isAnyFolderOpen() && (!mIsSearchBarHidden ||
+                    (mQSBSearchBar != null && mQSBSearchBar.getAlpha() < 1f))) {
                 if (mLauncher != null && mLauncher.shouldShowSearchBar()
                         && mQSBSearchBar.getVisibility() != View.VISIBLE) {
                     mQSBSearchBar.setVisibility(View.VISIBLE);