diff --git a/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationScreen.kt b/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationScreen.kt
index 02846c31c30ec5bdf9c1a37bdc3df12947dcfa0b..a92db09023873b50143226db6a3ca8594a977e54 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationScreen.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/login/RegistrationScreen.kt
@@ -166,8 +166,8 @@ fun PasswordForm(
         showErrorWhen = AFTER_FOCUS_LOST_ONCE,
         errorMessage = i18n("startup.error.password_too_weak"),
         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Next),
-        modifier = Modifier.fillMaxWidth().apply {
-            if (focusRequester != null) focusRequester(focusRequester)
+        modifier = Modifier.fillMaxWidth().run {
+            if (focusRequester != null) focusRequester(focusRequester) else this
         },
         onEnter = { focusManager.moveFocus(FocusDirection.Next) },
     )