diff --git a/app/src/main/java/com/wireguard/android/ProfileListActivity.java b/app/src/main/java/com/wireguard/android/ProfileListActivity.java
index 1e344060..31f845c2 100644
--- a/app/src/main/java/com/wireguard/android/ProfileListActivity.java
+++ b/app/src/main/java/com/wireguard/android/ProfileListActivity.java
@@ -58,8 +58,10 @@ public class ProfileListActivity extends ProfileActivity {
     }
 
     public void onProfileSelected(String profile) {
-        setIsEditing(false);
         if (isSplitLayout) {
+            if (isEditing())
+                getFragmentManager().popBackStack();
+            setIsEditing(false);
             updateLayout(profile);
             setCurrentProfile(profile);
         } else if (profile != null) {
@@ -85,8 +87,6 @@ public class ProfileListActivity extends ProfileActivity {
 
     public void updateLayout(String profile) {
         final Fragment fragment = getFragmentManager().findFragmentById(R.id.fragment_container);
-        if (isEditing() && profile == null)
-            throw new IllegalStateException();
         if (isEditing()) {
             if (fragment instanceof ProfileEditFragment) {
                 final ProfileEditFragment editFragment = (ProfileEditFragment) fragment;