diff --git a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
index ad1a50bd..3e4146af 100644
--- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
@@ -507,10 +507,12 @@ fun ChatRouterScreen(
     }
 
     if (showAddServerSheet) {
-        val addServerSheetState = rememberModalBottomSheetState()
+        val addServerSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
 
         ModalBottomSheet(
             sheetState = addServerSheetState,
+            sheetGesturesEnabled = false,
+            dragHandle = {},
             onDismissRequest = {
                 showAddServerSheet = false
             }
@@ -563,10 +565,12 @@ fun ChatRouterScreen(
     }
 
     if (showWebhookInfoSheet) {
-        val webhookInfoSheetState = rememberModalBottomSheetState()
+        val webhookInfoSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
 
         ModalBottomSheet(
             sheetState = webhookInfoSheetState,
+            sheetGesturesEnabled = false,
+            dragHandle = {},
             onDismissRequest = {
                 showWebhookInfoSheet = false
             }