diff --git a/src/com/android/contacts/list/ContactListFilterController.java b/src/com/android/contacts/list/ContactListFilterController.java
index a874a7f..934fa49 100644
--- a/src/com/android/contacts/list/ContactListFilterController.java
+++ b/src/com/android/contacts/list/ContactListFilterController.java
@@ -167,8 +167,6 @@
                     new ContactListFilter(ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS));
             mFilters.append(mNextFilterId++,
                     new ContactListFilter(ContactListFilter.FILTER_TYPE_STARRED));
-            mFilters.append(mNextFilterId++,
-                    new ContactListFilter(ContactListFilter.FILTER_TYPE_CUSTOM));
         }
 
         for (int index = 0; index < count; index++) {
@@ -194,11 +192,12 @@
             if (firstAndOnly) {
                 mFilters.append(mNextFilterId++,
                         new ContactListFilter(ContactListFilter.FILTER_TYPE_STARRED));
-                mFilters.append(mNextFilterId++,
-                        new ContactListFilter(ContactListFilter.FILTER_TYPE_CUSTOM));
             }
         }
 
+        mFilters.append(mNextFilterId++,
+                new ContactListFilter(ContactListFilter.FILTER_TYPE_CUSTOM));
+
         boolean filterChanged = false;
         if (mFilter == null  || !filterValid) {
             filterChanged = mFilter != null;