diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index c2c92c0ee1..40b6b3eda0 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -391,6 +391,7 @@
                     android:layout_marginTop="6dp"
                     android:layout_marginEnd="6dp"
                     android:minHeight="75dp"
+                    android:nextFocusRight="@+id/cbSignature"
                     android:text="Signature"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textIsSelectable="true"
@@ -402,6 +403,8 @@
                     android:id="@+id/cbSignature"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:nextFocusLeft="@id/tvSignature"
+                    android:nextFocusRight="@+id/ibSignature"
                     app:layout_constraintEnd_toEndOf="@id/ibSignature"
                     app:layout_constraintStart_toStartOf="@id/ibSignature"
                     app:layout_constraintTop_toTopOf="@+id/tvSignature" />
@@ -414,6 +417,7 @@
                     android:layout_marginEnd="6dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/title_edit_signature"
+                    android:nextFocusLeft="@id/cbSignature"
                     android:padding="3dp"
                     android:tooltipText="@string/title_edit_signature"
                     app:layout_constraintEnd_toEndOf="parent"