diff --git a/app/build.gradle b/app/build.gradle
index aecd21ea7..88a441f7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,7 +129,7 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:${vNav}"
 
     implementation 'androidx.biometric:biometric:1.0.1'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'
     implementation 'androidx.browser:browser:1.2.0'
     implementation 'androidx.preference:preference:1.1.0'
diff --git a/app/src/main/res/layout/dialog_settings_app_name.xml b/app/src/main/res/layout/dialog_settings_app_name.xml
index cc549a77c..508241aad 100644
--- a/app/src/main/res/layout/dialog_settings_app_name.xml
+++ b/app/src/main/res/layout/dialog_settings_app_name.xml
@@ -13,7 +13,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:padding="@dimen/margin_generic">
 
diff --git a/app/src/main/res/layout/dialog_settings_download_path.xml b/app/src/main/res/layout/dialog_settings_download_path.xml
index f3ea581a1..f05ff5a43 100644
--- a/app/src/main/res/layout/dialog_settings_download_path.xml
+++ b/app/src/main/res/layout/dialog_settings_download_path.xml
@@ -13,7 +13,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:padding="@dimen/margin_generic">
 
diff --git a/app/src/main/res/layout/dialog_settings_update_channel.xml b/app/src/main/res/layout/dialog_settings_update_channel.xml
index 26095efa2..843f12efc 100644
--- a/app/src/main/res/layout/dialog_settings_update_channel.xml
+++ b/app/src/main/res/layout/dialog_settings_update_channel.xml
@@ -13,7 +13,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:padding="@dimen/margin_generic">