diff --git a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
index 97c5bbbcf..1f7bf0444 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
@@ -451,10 +451,11 @@ private fun TextInput(
         Spacer(Modifier.width(8.dp))
         Button(
             onClick = {
-                if (message.value.text.isNotEmpty()) {
-                    onClick(message.value.text)
-                    message.value = TextFieldValue("")
+                val str = message.value.text.trim()
+                if (str.isNotEmpty()) {
                     focusManager.clearFocus()
+                    onClick(str)
+                    message.value = TextFieldValue("")
                 }
             },
             modifier = Modifier.size(48.dp),