diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/TextEditor.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/TextEditor.kt
index d238b07f71..cad0d247e9 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/TextEditor.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/TextEditor.kt
@@ -108,12 +108,15 @@ fun PlainTextEditor(
   value: MutableState<String>,
   placeholder: String? = null,
   singleLine: Boolean = true,
-  contentPadding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING, vertical = 12.dp)
+  contentPadding: PaddingValues = PaddingValues(horizontal = DEFAULT_PADDING, vertical = 12.dp),
+  focusRequester: FocusRequester? = null
 ) {
   BasicTextField(
     value = value.value,
     onValueChange = { value.value = it },
-    modifier = Modifier.fillMaxWidth().padding(contentPadding),
+    modifier = Modifier.fillMaxWidth()
+      .then(if (focusRequester != null) Modifier.focusRequester(focusRequester) else Modifier)
+      .padding(contentPadding),
     textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
     singleLine = singleLine,
     cursorBrush = SolidColor(MaterialTheme.colors.secondary),
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SetSimplexNameView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SetSimplexNameView.kt
index 8e2c6a4d0d..a7fa9c5983 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SetSimplexNameView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/SetSimplexNameView.kt
@@ -6,13 +6,13 @@ import SectionItemView
 import SectionItemViewSpaceBetween
 import SectionTextFooter
 import SectionView
-import itemHPadding
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
@@ -132,10 +132,13 @@ fun SetSimplexDomainView(
       AppBarTitle(title)
       SectionView {
         if (editing.value) {
-          Box(Modifier.fillMaxWidth().heightIn(min = DEFAULT_MIN_SECTION_ITEM_HEIGHT), contentAlignment = Alignment.CenterEnd) {
-            PlainTextEditor(name, placeholder = placeholder, contentPadding = PaddingValues(horizontal = itemHPadding, vertical = DEFAULT_PADDING_HALF))
-            if (!isValid) {
-              Icon(painterResource(MR.images.ic_error), null, Modifier.padding(end = DEFAULT_PADDING_HALF), tint = MaterialTheme.colors.error)
+          val focusRequester = remember { FocusRequester() }
+          SectionItemViewSpaceBetween(click = { focusRequester.requestFocus() }) {
+            Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
+              PlainTextEditor(name, placeholder = placeholder, contentPadding = PaddingValues(), focusRequester = focusRequester)
+              if (!isValid) {
+                Icon(painterResource(MR.images.ic_error), null, tint = MaterialTheme.colors.error)
+              }
             }
           }
         } else {