diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameFragment.java
index a1f7c91eb..4108f7a5f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileNameFragment.java
@@ -91,12 +91,14 @@ public class EditProfileNameFragment extends Fragment {
         setEditTextEnabled(familyName, true);
         break;
       case IDLE:
+        saveButton.setClickable(true);
         saveButton.cancelSpinning();
         saveButton.setAlpha(1);
         setEditTextEnabled(givenName, true);
         setEditTextEnabled(familyName, true);
         break;
       case IN_PROGRESS:
+        saveButton.setClickable(false);
         saveButton.setSpinning();
         saveButton.setAlpha(1);
         setEditTextEnabled(givenName, false);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/views/CircularProgressMaterialButton.kt b/app/src/main/java/org/thoughtcrime/securesms/util/views/CircularProgressMaterialButton.kt
index 2f77fcafd..e1dd35067 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/views/CircularProgressMaterialButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/views/CircularProgressMaterialButton.kt
@@ -61,6 +61,12 @@ class CircularProgressMaterialButton @JvmOverloads constructor(
     progressIndicator.visible = enabled
   }
 
+  override fun setClickable(clickable: Boolean) {
+    super.setClickable(clickable)
+    materialButton.isClickable = clickable
+    progressIndicator.visible = clickable
+  }
+
   override fun onSaveInstanceState(): Parcelable {
     return Bundle().apply {
       putParcelable(SUPER_STATE, super.onSaveInstanceState())