diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index d2b21b0..971c6f5 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -1169,10 +1169,16 @@
             });
         }
 
-        public void filterSearch(String query) {
+        @VisibleForTesting
+        void filterSearch(String query) {
             if (mSearchFilter == null) {
                 mSearchFilter = new SearchFilter();
             }
+            // If we haven't load apps list completely, don't filter anything.
+            if(mOriginalEntries == null) {
+                Log.w(TAG, "Apps haven't loaded completely yet, so nothing can be filtered");
+                return;
+            }
             mSearchFilter.filter(query);
         }