diff --git a/feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ScannerViewModel.kt b/feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ScannerViewModel.kt
index d094aa170..8ed5619cd 100644
--- a/feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ScannerViewModel.kt
+++ b/feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ScannerViewModel.kt
@@ -206,6 +206,7 @@ open class ScannerViewModel(
                 changeDeviceAddress(it.fullAddress)
                 true
             } else {
+                radioPrefs.setDevName(it.name)
                 requestBonding(it)
                 false
             }
@@ -216,6 +217,7 @@ open class ScannerViewModel(
                 changeDeviceAddress(it.fullAddress)
                 true
             } else {
+                radioPrefs.setDevName(it.name)
                 requestPermission(it)
                 false
             }
diff --git a/feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ui/components/ConnectingDeviceInfo.kt b/feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ui/components/ConnectingDeviceInfo.kt
index ebc981398..0d079ebdc 100644
--- a/feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ui/components/ConnectingDeviceInfo.kt
+++ b/feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ui/components/ConnectingDeviceInfo.kt
@@ -26,13 +26,13 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.resources.stringResource
 import org.meshtastic.core.model.ConnectionState
@@ -79,20 +79,17 @@ fun ConnectingDeviceInfo(
             }
         }
 
-        @OptIn(ExperimentalMaterial3ExpressiveApi::class)
-        val largeHeight = ButtonDefaults.LargeContainerHeight
-        @OptIn(ExperimentalMaterial3ExpressiveApi::class)
         Button(
-            onClick = onClickDisconnect,
-            shapes = ButtonDefaults.shapesFor(largeHeight),
-            modifier = Modifier.fillMaxWidth().height(largeHeight),
+            shape = RectangleShape,
+            modifier = Modifier.fillMaxWidth().height(40.dp),
             colors =
             ButtonDefaults.buttonColors(
                 containerColor = MaterialTheme.colorScheme.StatusRed,
                 contentColor = Color.White,
             ),
+            onClick = onClickDisconnect,
         ) {
-            Text(stringResource(Res.string.disconnect), style = ButtonDefaults.textStyleFor(largeHeight))
+            Text(stringResource(Res.string.disconnect))
         }
     }
 }