diff --git a/core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/component/EditTextPreference.kt b/core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/component/EditTextPreference.kt
index 43a19ef1b..0e4699a28 100644
--- a/core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/component/EditTextPreference.kt
+++ b/core/ui/src/commonMain/kotlin/org/meshtastic/core/ui/component/EditTextPreference.kt
@@ -205,6 +205,7 @@ fun EditTextPreference(
     onFocusChanged: (FocusState) -> Unit = {},
     trailingIcon: (@Composable () -> Unit)? = null,
     visualTransformation: VisualTransformation = VisualTransformation.None,
+    multiline: Boolean = false,
 ) {
     var isFocused by remember { mutableStateOf(false) }
 
@@ -212,7 +213,8 @@ fun EditTextPreference(
         OutlinedTextField(
             modifier = Modifier.fillMaxWidth().onFocusEvent { onFocusChanged(it) },
             value = value,
-            singleLine = true,
+            singleLine = !multiline,
+            maxLines = if (multiline) 5 else 1,
             enabled = enabled,
             isError = isError,
             onValueChange = {
diff --git a/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/component/CannedMessageConfigItemList.kt b/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/component/CannedMessageConfigItemList.kt
index 4c6cdc9f5..89df9d4be 100644
--- a/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/component/CannedMessageConfigItemList.kt
+++ b/feature/settings/src/commonMain/kotlin/org/meshtastic/feature/settings/radio/component/CannedMessageConfigItemList.kt
@@ -181,6 +181,7 @@ fun CannedMessageConfigScreen(viewModel: RadioConfigViewModel, onBack: () -> Uni
                     KeyboardOptions.Default.copy(keyboardType = KeyboardType.Text, imeAction = ImeAction.Done),
                     keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
                     onValueChanged = { messagesInput = it },
+                    multiline = true,
                 )
             }
         }