diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt
index 05d55900..1bc9104f 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt
@@ -9,6 +9,7 @@ import android.text.style.TypefaceSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import androidx.fragment.app.viewModels
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -48,8 +49,19 @@ class RepositorySheetX() : BottomSheetDialogFragment() {
     private val syncConnection = Connection(SyncService::class.java)
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val sheet = super.onCreateDialog(savedInstanceState) as BottomSheetDialog
-        sheet.behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        val sheet = super.onCreateDialog(savedInstanceState)
+        sheet.setOnShowListener {
+            val bsd = it as BottomSheetDialog
+            val parentLayout =
+                bsd.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
+            parentLayout?.let { view ->
+                val behaviour = BottomSheetBehavior.from(view)
+                val layoutParams = view.layoutParams
+                layoutParams.height = WindowManager.LayoutParams.MATCH_PARENT
+                view.layoutParams = layoutParams
+                behaviour.state = BottomSheetBehavior.STATE_EXPANDED
+            }
+        }
         return sheet
     }
 
diff --git a/src/main/res/layout/sheet_repository.xml b/src/main/res/layout/sheet_repository.xml
index 1b7a7fdc..617b2ea8 100644
--- a/src/main/res/layout/sheet_repository.xml
+++ b/src/main/res/layout/sheet_repository.xml
@@ -19,14 +19,12 @@
 
             <com.google.android.material.circularreveal.CircularRevealFrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="12dp"
-                android:paddingHorizontal="12dp">
+                android:layout_height="match_parent"
+                android:padding="12dp">
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:orientation="vertical">
 
                     <androidx.appcompat.widget.LinearLayoutCompat
@@ -169,6 +167,11 @@
                             android:textSize="16sp" />
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1"/>
+
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">