diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/CustomLogin.kt b/android/src/main/java/com/tailscale/ipn/ui/view/CustomLogin.kt
index 991ec39b77..83ae0b8cc3 100644
--- a/android/src/main/java/com/tailscale/ipn/ui/view/CustomLogin.kt
+++ b/android/src/main/java/com/tailscale/ipn/ui/view/CustomLogin.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Button
 import androidx.compose.material3.ListItem
@@ -26,6 +27,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.unit.dp
 import com.tailscale.ipn.R
@@ -140,7 +142,11 @@ fun LoginView(
                   placeholder = {
                     Text(strings.placeholder, style = MaterialTheme.typography.bodySmall)
                   },
-                  keyboardOptions = KeyboardOptions(capitalization = KeyboardCapitalization.None))
+                  keyboardOptions =
+                      KeyboardOptions(
+                          capitalization = KeyboardCapitalization.None, imeAction = ImeAction.Go),
+                  keyboardActions =
+                      KeyboardActions(onGo = { onSubmitAction(textVal) }))
             })
 
         ListItem(