diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 6750c72..3f6be2c 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -39,10 +39,7 @@
         android:clipToPadding="false"
         android:layout_below="@id/search_container_all_apps" >
 
-        <com.android.launcher3.allapps.PredictionRowView
-            android:id="@+id/header_content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+        <include layout="@layout/predictions_view" android:id="@+id/header_content" />
 
         <include layout="@layout/all_apps_divider"
             android:id="@+id/divider"
diff --git a/res/layout/predictions_view.xml b/res/layout/predictions_view.xml
new file mode 100644
index 0000000..280290c
--- /dev/null
+++ b/res/layout/predictions_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.android.launcher3.allapps.PredictionRowView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/src/com/android/launcher3/allapps/PredictionRowView.java b/src/com/android/launcher3/allapps/PredictionRowView.java
index 30c30c8..1aee948 100644
--- a/src/com/android/launcher3/allapps/PredictionRowView.java
+++ b/src/com/android/launcher3/allapps/PredictionRowView.java
@@ -111,6 +111,7 @@
     public void setPredictedApps(List<ComponentKeyMapper<AppInfo>> apps) {
         mPredictedAppComponents.clear();
         mPredictedAppComponents.addAll(apps);
+        mPredictedApps.clear();
         mPredictedApps.addAll(processPredictedAppComponents(mPredictedAppComponents));
         onAppsUpdated();
     }