diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
index 96bd773864..6c759c913e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsFragment.java
@@ -262,11 +262,8 @@ public class AddGroupDetailsFragment extends LoggingFragment {
   }
 
   private void setCreateEnabled(boolean isEnabled) {
-    if (create.isClickable() == isEnabled) {
-      return;
-    }
-
     create.setClickable(isEnabled);
+    create.setEnabled(isEnabled);
   }
 
   private void showAvatarPicker() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsViewModel.java
index 1a6e941ceb..e0bc13fc9c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/details/AddGroupDetailsViewModel.java
@@ -48,7 +48,7 @@ public final class AddGroupDetailsViewModel extends ViewModel {
     this.repository = repository;
 
     MutableLiveData<List<GroupMemberEntry.NewGroupCandidate>> initialMembers = new MutableLiveData<>();
-    LiveData<Boolean>                                         isValidName    = Transformations.map(name, name -> !TextUtils.isEmpty(name));
+    LiveData<Boolean>                                         isValidName    = Transformations.map(name, name -> !name.isBlank());
 
     members       = LiveDataUtil.combineLatest(initialMembers, deleted, AddGroupDetailsViewModel::filterDeletedMembers);
     isMms         = Transformations.map(members, AddGroupDetailsViewModel::isAnyForcedSms);