diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c7fd4d565..6cf978353 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -82,11 +82,12 @@
                     android:ellipsize="end"
                     android:gravity="start|center_vertical"
                     android:lines="1"
+                    android:textAlignment="viewStart"
                     android:textColor="@color/fontSecondaryAppbar"
                     android:textSize="16sp"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/menu_button"
-                    app:layout_constraintRight_toLeftOf="@id/rightContainer"
+                    app:layout_constraintStart_toEndOf="@id/menu_button"
+                    app:layout_constraintEnd_toStartOf="@id/rightContainer"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="Search in Nextcloud" />
 
diff --git a/app/src/main/res/layout/search_layout.xml b/app/src/main/res/layout/search_layout.xml
index 2fe7ce209..759a86922 100644
--- a/app/src/main/res/layout/search_layout.xml
+++ b/app/src/main/res/layout/search_layout.xml
@@ -74,8 +74,8 @@
                 android:textColor="@color/fontSecondaryAppbar"
                 android:textSize="16sp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toRightOf="@id/menu_button"
-                app:layout_constraintRight_toLeftOf="@id/rightContainer"
+                app:layout_constraintStart_toEndOf="@id/menu_button"
+                app:layout_constraintEnd_toStartOf="@id/rightContainer"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="@string/appbar_search_in" />