diff --git a/CHANGES.md b/CHANGES.md
index 207d04d6d0..0d59ad563b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -21,6 +21,7 @@ Bugfix 🐛:
  - Use vendor prefix for non merged MSC (#1537)
  - Compress images before sending (#1333)
  - Searching by displayname is case sensitive (#1468)
+ - Fix layout overlap issue (#1407)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index 63004365dc..d4fdaae35c 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -30,13 +30,13 @@
 
     <TextView
         android:id="@+id/formSwitchSummary"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         android:textColor="?riotx_text_secondary"
         android:textSize="14sp"
         app:layout_constraintBottom_toTopOf="@+id/formSwitchDivider"
+        app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
         app:layout_constraintStart_toStartOf="@+id/formSwitchTitle"
         app:layout_constraintTop_toBottomOf="@+id/formSwitchTitle"
         tools:text="@string/create_room_public_description" />
@@ -46,7 +46,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="19dp"
-        android:layout_marginRight="19dp"
         app:layout_constraintBottom_toTopOf="@+id/formSwitchDivider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />