diff --git a/src/com/android/contacts/group/GroupDetailFragment.java b/src/com/android/contacts/group/GroupDetailFragment.java
index a27d3e0..1205c31 100644
--- a/src/com/android/contacts/group/GroupDetailFragment.java
+++ b/src/com/android/contacts/group/GroupDetailFragment.java
@@ -149,6 +149,7 @@
         mGroupSourceViewContainer = (ViewGroup) mRootView.findViewById(
                 R.id.group_source_view_container);
         mMemberListView = (ListView) mRootView.findViewById(android.R.id.list);
+        mMemberListView.setAdapter(mAdapter);
 
         return mRootView;
     }
@@ -162,11 +163,6 @@
         mAdapter.enableQuickContact(enableQuickContact);
     }
 
-    private void configureAdapter(long groupId) {
-        mGroupId = groupId;
-        mMemberListView.setAdapter(mAdapter);
-    }
-
     private void configurePhotoLoader() {
         if (mContext != null) {
             if (mPhotoManager == null) {
@@ -234,7 +230,6 @@
                     bindGroupMetaData(data);
 
                     // Retrieve the list of members
-                    configureAdapter(mGroupId);
                     startGroupMembersLoader();
                     return;
                 }
