diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
index 71552ed29..db969b571 100644
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_fragment.xml
@@ -148,6 +148,8 @@
                     android:spinnerMode="dropdown"
                     android:popupBackground="@drawable/shape_squircle_white_background"
                     android:background="@drawable/edit_text_background"
+                    app:layout_constraintHorizontal_bias="0"
+                    app:layout_constraintWidth_max="@dimen/text_input_max_width"
                     app:layout_constraintTop_toBottomOf="@id/media_encryption_label"
                     app:layout_constraintStart_toStartOf="@id/media_encryption_label"
                     app:layout_constraintEnd_toEndOf="parent" />
@@ -461,6 +463,8 @@
                         android:popupBackground="@drawable/shape_squircle_white_background"
                         android:background="@drawable/edit_text_background"
                         android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/input_audio_device_label"
                         app:layout_constraintStart_toStartOf="@id/input_audio_device_label"
                         app:layout_constraintEnd_toEndOf="parent" />
@@ -510,6 +514,8 @@
                         android:popupBackground="@drawable/shape_squircle_white_background"
                         android:background="@drawable/edit_text_background"
                         android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/output_audio_device_label"
                         app:layout_constraintStart_toStartOf="@id/output_audio_device_label"
                         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/settings_meetings.xml b/app/src/main/res/layout/settings_meetings.xml
index 0cfd3e216..50882d1de 100644
--- a/app/src/main/res/layout/settings_meetings.xml
+++ b/app/src/main/res/layout/settings_meetings.xml
@@ -44,6 +44,8 @@
             android:overlapAnchor="false"
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/layout_title"
             app:layout_constraintStart_toStartOf="@id/layout_title"
             app:layout_constraintEnd_toEndOf="@id/layout_title" />
diff --git a/app/src/main/res/layout/settings_tunnel.xml b/app/src/main/res/layout/settings_tunnel.xml
index 114347bb8..b3a0a2766 100644
--- a/app/src/main/res/layout/settings_tunnel.xml
+++ b/app/src/main/res/layout/settings_tunnel.xml
@@ -208,6 +208,8 @@
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
             android:background="@drawable/edit_text_background"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/tunnel_mode_label"
             app:layout_constraintStart_toStartOf="@id/tunnel_mode_label"
             app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/settings_user_interface.xml b/app/src/main/res/layout/settings_user_interface.xml
index ec419767b..467b78693 100644
--- a/app/src/main/res/layout/settings_user_interface.xml
+++ b/app/src/main/res/layout/settings_user_interface.xml
@@ -56,6 +56,8 @@
             android:overlapAnchor="false"
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/theme_title"
             app:layout_constraintStart_toStartOf="@id/theme_title"
             app:layout_constraintEnd_toEndOf="@id/theme_title" />
@@ -100,6 +102,8 @@
             android:overlapAnchor="false"
             android:spinnerMode="dropdown"
             android:popupBackground="@drawable/shape_squircle_white_background"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintWidth_max="@dimen/text_input_max_width"
             app:layout_constraintTop_toBottomOf="@id/color_title"
             app:layout_constraintStart_toStartOf="@id/color_title"
             app:layout_constraintEnd_toEndOf="@id/color_title" />
diff --git a/app/src/main/res/values-sw600dp/dimen.xml b/app/src/main/res/values-sw600dp/dimen.xml
index 9970d9654..78da8b09d 100644
--- a/app/src/main/res/values-sw600dp/dimen.xml
+++ b/app/src/main/res/values-sw600dp/dimen.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="welcome_icon_size">150dp</dimen>
+    <dimen name="text_input_max_width">600dp</dimen>
 </resources>
\ No newline at end of file