diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index 1a3dfe9644..b5f4245680 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -219,16 +219,13 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         vibratePreference.setValueIndex(2);
       }
 
-      colorPreference.setEnabled(recipients.isSingleRecipient() && !recipients.isGroupRecipient());
-      colorPreference.setChoices(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(getActivity()));
-      colorPreference.setValue(recipients.getColor().toActionBarColor(getActivity()));
-
       if (!recipients.isSingleRecipient() || recipients.isGroupRecipient()) {
-        blockPreference.setEnabled(false);
-        identityPreference.setEnabled(false);
+        this.getPreferenceScreen().removePreference(colorPreference);
+        this.getPreferenceScreen().removePreference(blockPreference);
+        this.getPreferenceScreen().removePreference(identityPreference);
       } else {
-        blockPreference.setEnabled(true);
-        identityPreference.setEnabled(true);
+        colorPreference.setChoices(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(getActivity()));
+        colorPreference.setValue(recipients.getColor().toActionBarColor(getActivity()));
 
         if (recipients.isBlocked()) blockPreference.setTitle(R.string.RecipientPreferenceActivity_unblock);
         else                        blockPreference.setTitle(R.string.RecipientPreferenceActivity_block);