diff --git a/src/com/android/contacts/activities/DialtactsActivity.java b/src/com/android/contacts/activities/DialtactsActivity.java
index 6d99129..2268743 100644
--- a/src/com/android/contacts/activities/DialtactsActivity.java
+++ b/src/com/android/contacts/activities/DialtactsActivity.java
@@ -508,7 +508,7 @@
             mSearchFragment.setQuickContactEnabled(true);
             mSearchFragment.setDarkTheme(true);
             mSearchFragment.setPhotoPosition(ContactListItemView.PhotoPosition.LEFT);
-            mSearchFragment.setStartDeferred(true);
+            mSearchFragment.setUserVisibleHint(false);
             final FragmentTransaction transaction = getFragmentManager().beginTransaction();
             if (mInSearchUi) {
                 transaction.show(mSearchFragment);
@@ -846,7 +846,7 @@
         // layout instead of asking the search menu item to take care of SearchView.
         mSearchView.onActionViewExpanded();
         mInSearchUi = true;
-        mSearchFragment.setStartDeferred(false);
+        mSearchFragment.setUserVisibleHint(true);
     }
 
     private void showInputMethod(View view) {
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 5afcbbd..3ba5957 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -817,8 +817,8 @@
             Fragment f = getFragment(position);
             mCurTransaction.show(f);
 
-            // Non primary pages should be deferred.
-            f.setStartDeferred(f != mCurrentPrimaryItem);
+            // Non primary pages are not visible.
+            f.setUserVisibleHint(f == mCurrentPrimaryItem);
             return f;
         }
 
@@ -849,10 +849,10 @@
             Fragment fragment = (Fragment) object;
             if (mCurrentPrimaryItem != fragment) {
                 if (mCurrentPrimaryItem != null) {
-                    mCurrentPrimaryItem.setStartDeferred(true);
+                    mCurrentPrimaryItem.setUserVisibleHint(false);
                 }
                 if (fragment != null) {
-                    fragment.setStartDeferred(false);
+                    fragment.setUserVisibleHint(true);
                 }
                 mCurrentPrimaryItem = fragment;
             }
