diff --git a/app/src/main/java/com/m57/hermescontrol/ui/model/ModelScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/model/ModelScreen.kt
index 0dcc6206..c429b731 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/model/ModelScreen.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/model/ModelScreen.kt
@@ -820,6 +820,10 @@ private fun ProviderCard(
                                             } else {
                                                 MaterialTheme.colorScheme.onSurface
                                             },
+                                        // Weight + wrap: a long model name grows
+                                        // the row vertically instead of pushing
+                                        // the check/pin buttons off-screen.
+                                        modifier = Modifier.weight(1f),
                                     )
                                     Row(
                                         verticalAlignment = Alignment.CenterVertically,
diff --git a/app/src/main/java/com/m57/hermescontrol/ui/model/components/ModelPickerDialog.kt b/app/src/main/java/com/m57/hermescontrol/ui/model/components/ModelPickerDialog.kt
index eaf37235..fe0acb78 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/model/components/ModelPickerDialog.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/model/components/ModelPickerDialog.kt
@@ -34,7 +34,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.m57.hermescontrol.R
 import com.m57.hermescontrol.data.model.ModelProvider
@@ -273,8 +272,8 @@ private fun ModelItemCard(
                 style = MaterialTheme.typography.bodyMedium,
                 fontWeight = FontWeight.Medium,
                 color = MaterialTheme.colorScheme.onSurface,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
+                // No maxLines/ellipsis: a long model name wraps so the full
+                // name stays readable while the pin button keeps its spot.
                 modifier = Modifier.weight(1f),
             )
             if (onPinToggle != null) {