diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 75168cd..afaafb7 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -20,6 +20,7 @@
 import android.content.Loader;
 import android.database.Cursor;
 import android.net.Uri;
+import android.provider.ContactsContract.Directory;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -79,7 +80,9 @@
 
     @Override
     public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
-        bindListHeader(data.getCount());
+        if (loader.getId() == Directory.DEFAULT) {
+            bindListHeader(data.getCount());
+        }
         super.onLoadFinished(loader, data);
         if (!isSearchMode() && mCallback != null) {
             mCallback.onLoadFinishedCallback();
