diff --git a/vector/src/main/java/im/vector/app/core/epoxy/FontScaleItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/FontScaleItem.kt
index 045a503def..16fe93ad8e 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/FontScaleItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/FontScaleItem.kt
@@ -50,9 +50,11 @@ abstract class FontScaleItem : VectorEpoxyModel<FontScaleItem.Holder>(R.layout.i
         holder.textView.isEnabled = enabled
         holder.button.isChecked = selected
         holder.button.isEnabled = enabled
-        holder.button.isClickable = enabled
+        holder.view.isClickable = enabled
         holder.view.onClick {
-            holder.button.performClick()
+            if (enabled) {
+                holder.button.performClick()
+            }
         }
         holder.button.setOnCheckedChangeListener(checkChangeListener)
     }