diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionAdapter.kt
index 359b73a64d..5db8bdeeb7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionAdapter.kt
@@ -60,7 +60,7 @@ class ChatColorSelectionAdapter(
       itemView.isSelected = model.isSelected
 
       auto.visibility = if (model.isAuto) View.VISIBLE else View.GONE
-      edit.visibility = if (model.isCustom) View.VISIBLE else View.GONE
+      edit.visibility = if (model.isCustom && model.isSelected) View.VISIBLE else View.GONE
 
       preview.setOnClickListener {
         if (model.isCustom && model.isSelected) {