diff --git a/src/com/android/contacts/common/list/DirectoryListLoader.java b/src/com/android/contacts/common/list/DirectoryListLoader.java
index c45a3ca..13d0f92 100644
--- a/src/com/android/contacts/common/list/DirectoryListLoader.java
+++ b/src/com/android/contacts/common/list/DirectoryListLoader.java
@@ -199,11 +199,13 @@
             mDefaultDirectoryList.addRow(new Object[] {
                     Directory.DEFAULT,
                     getContext().getString(R.string.contactsList),
+                    null,
                     null
             });
             mDefaultDirectoryList.addRow(new Object[] {
                     Directory.LOCAL_INVISIBLE,
                     getContext().getString(R.string.local_invisible_directory),
+                    null,
                     null
             });
         }
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 3c0acf6..a336e09 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -511,6 +511,8 @@
         if (savedInstanceState != null && savedInstanceState.getBoolean(KEY_DELETION_IN_PROGRESS)) {
             deleteSelectedContacts();
         }
+
+        setDirectorySearchMode();
     }
 
     public void initializeActionBarAdapter(Bundle savedInstanceState) {
@@ -576,7 +578,9 @@
 
         setQueryString(mActionBarAdapter.getQueryString(), true);
         setVisibleScrollbarEnabled(!isSearchMode());
+    }
 
+    private void setDirectorySearchMode() {
         if (mContactsRequest.isDirectorySearchEnabled()) {
             setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DEFAULT);
         } else {