diff --git a/app/src/main/res/layout/group_join_bottom_sheet.xml b/app/src/main/res/layout/group_join_bottom_sheet.xml
index de6f0fa970..205b2ca08a 100644
--- a/app/src/main/res/layout/group_join_bottom_sheet.xml
+++ b/app/src/main/res/layout/group_join_bottom_sheet.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     tools:theme="@style/Theme.Signal.RoundedBottomSheet.Light">
 
     <ImageView
@@ -109,7 +109,7 @@
         android:id="@+id/group_join_cancel_button"
         style="@style/Signal.Widget.Button.Large.Tonal"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_marginStart="@dimen/dsl_settings_gutter"
         android:layout_marginTop="26dp"
         android:layout_marginBottom="32dp"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3b8e6da650..b60d80563f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -556,6 +556,11 @@
         <item name="backgroundTint">@color/signal_colorSurface1</item>
     </style>
 
+    <style name="Widget.Signal.BottomSheet.MaterialButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog.Flush">
+        <item name="android:lines">@null</item>
+        <item name="android:singleLine">false</item>
+    </style>
+
     <style name="Theme.Signal.RoundedBottomSheet.Light">
         <item name="bottomSheetStyle">@style/Widget.Signal.BottomSheet.Rounded</item>
 
@@ -581,6 +586,7 @@
         <item name="android:navigationBarColor" tools:ignore="NewApi">@color/signal_colorSurface1</item>
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
         <item name="android:statusBarColor" tools:ignore="NewApi">@color/transparent</item>
+        <item name="materialButtonStyle">@style/Widget.Signal.BottomSheet.MaterialButtonStyle</item>
     </style>
 
     <style name="Theme.Signal.RoundedBottomSheet.Stories">