diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad1b97e98..275ff23c9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -269,7 +269,7 @@
               android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".PushContactSelectionActivity"
+    <activity android:name=".ContactMultiSelectionActivity"
           android:label="@string/AndroidManifest__select_contacts"
           android:windowSoftInputMode="stateHidden"
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
diff --git a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java b/src/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java
similarity index 66%
rename from src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
rename to src/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java
index 056e94906..74022cb3b 100644
--- a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
+++ b/src/org/thoughtcrime/securesms/ContactMultiSelectionActivity.java
@@ -28,27 +28,36 @@ import java.util.List;
  * @author Moxie Marlinspike
  *
  */
-public class PushContactSelectionActivity extends ContactSelectionActivity {
+public class ContactMultiSelectionActivity extends ContactSelectionActivity {
 
   @SuppressWarnings("unused")
-  private final static String TAG = PushContactSelectionActivity.class.getSimpleName();
+  private final static String TAG = ContactMultiSelectionActivity.class.getSimpleName();
 
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {
     getIntent().putExtra(ContactSelectionListFragment.MULTI_SELECT, true);
     super.onCreate(icicle, ready);
 
-    getToolbar().setNavigationIcon(R.drawable.ic_check_white_24dp);
     getToolbar().setNavigationOnClickListener(v -> {
-      Intent resultIntent = getIntent();
-      List<String> selectedContacts = contactsFragment.getSelectedContacts();
-
-      if (selectedContacts != null) {
-        resultIntent.putStringArrayListExtra("contacts", new ArrayList<>(selectedContacts));
-      }
-
-      setResult(RESULT_OK, resultIntent);
+      saveSelection();
       finish();
     });
   }
+
+  @Override
+  public void onBackPressed() {
+    saveSelection();
+    super.onBackPressed();
+  }
+
+  private void saveSelection() {
+    Intent resultIntent = getIntent();
+    List<String> selectedContacts = contactsFragment.getSelectedContacts();
+
+    if (selectedContacts != null) {
+      resultIntent.putStringArrayListExtra("contacts", new ArrayList<>(selectedContacts));
+    }
+
+    setResult(RESULT_OK, resultIntent);
+  }
 }
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
index f5fed5eb8..a2f733336 100644
--- a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
@@ -90,7 +90,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
     setSupportActionBar(toolbar);
 
     assert  getSupportActionBar() != null;
-    getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     getSupportActionBar().setDisplayShowTitleEnabled(false);
     getSupportActionBar().setIcon(null);
     getSupportActionBar().setLogo(null);
diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index f16fd4354..1c5e135bf 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -43,7 +43,6 @@ import com.soundcloud.android.crop.Crop;
 import org.thoughtcrime.securesms.connect.ApplicationDcContext;
 import org.thoughtcrime.securesms.connect.DcHelper;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
-import org.thoughtcrime.securesms.contacts.RecipientsEditor;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.database.Address;
@@ -114,6 +113,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     //noinspection ConstantConditions
     createVerified = getIntent().getBooleanExtra(GROUP_CREATE_VERIFIED_EXTRA, false);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
     initializeResources();
     initializeExistingGroup();
   }
@@ -352,7 +352,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   private class AddRecipientButtonListener implements View.OnClickListener {
     @Override
     public void onClick(View v) {
-      Intent intent = new Intent(GroupCreateActivity.this, PushContactSelectionActivity.class);
+      Intent intent = new Intent(GroupCreateActivity.this, ContactMultiSelectionActivity.class);
       intent.putExtra(ContactSelectionListFragment.SELECT_VERIFIED_EXTRA, createVerified);
       if (groupToUpdate.isPresent()) {
         intent.putExtra(ContactSelectionListFragment.DISPLAY_MODE, DisplayMode.FLAG_PUSH);