diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 5a2d167f8c..a7c75ad826 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -481,6 +481,10 @@ public class AllAppsContainerView extends StretchRecyclerViewContainer implement
                     });
             onActivePageChanged(mViewPager.getNextPage());
         } else {
+            if (mWorkModeSwitch != null) {
+                removeView(mWorkModeSwitch);
+                mWorkModeSwitch = null;
+            }
             mAH[AdapterHolder.MAIN].setup(findViewById(R.id.apps_list_view), null);
             mAH[AdapterHolder.WORK].recyclerView = null;
         }