diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt
index 801da7e79b..48133a0308 100644
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.android.kt
@@ -28,52 +28,60 @@ actual fun UserPickerInactiveUsersSection(
 ) {
   val scrollState = rememberScrollState()
 
-  SectionItemView(minHeight = 80.dp, padding = PaddingValues(start = 16.dp), disabled = stopped) {
-    Box {
-      Row(modifier = Modifier.padding(end = DEFAULT_PADDING).horizontalScroll(scrollState)) {
-        users.forEach { u ->
-          val size = 60
-          UserPickerInactiveUserBadge(u, stopped) {
-            onUserClicked(it)
-          }
-          Spacer(Modifier.width((size * 0.618).dp))
-        }
-      }
-      Box(
-        contentAlignment = Alignment.CenterEnd,
-        modifier = Modifier.fillMaxWidth()
-      ) {
-        Row(
-          horizontalArrangement = Arrangement.End,
-          modifier = Modifier.fillMaxWidth().padding(end = DEFAULT_PADDING).height(60.dp)
-        ) {
-          Canvas(modifier = Modifier.height(60.dp).width(200.dp)) {
-            drawRect(
-              brush = Brush.linearGradient(
-                colors = listOf(
-                  Color.Transparent,
-                  CurrentColors.value.colors.surface,
-                )
-              ),
-            )
+  if (users.isNotEmpty()) {
+    SectionItemView(minHeight = 80.dp, padding = PaddingValues(start = 16.dp), disabled = stopped) {
+      Box {
+        Row(modifier = Modifier.padding(end = DEFAULT_PADDING).horizontalScroll(scrollState)) {
+          users.forEach { u ->
+            val size = 60
+            UserPickerInactiveUserBadge(u, stopped) {
+              onUserClicked(it)
+            }
+            Spacer(Modifier.width((size * 0.618).dp))
           }
         }
-        IconButton(
-          onClick = onShowAllProfilesClicked,
-          enabled = !stopped,
+        Box(
+          contentAlignment = Alignment.CenterEnd,
+          modifier = Modifier.fillMaxWidth()
         ) {
-          Box(
-            contentAlignment = Alignment.CenterEnd
+          Row(
+            horizontalArrangement = Arrangement.End,
+            modifier = Modifier.fillMaxWidth().padding(end = DEFAULT_PADDING).height(60.dp)
           ) {
-            Icon(
-              painterResource(MR.images.ic_chevron_right),
-              stringResource(MR.strings.your_chat_profiles),
-              tint = MaterialTheme.colors.secondary,
-              modifier = Modifier.size(60.dp * fontSizeSqrtMultiplier)
-            )
+            Canvas(modifier = Modifier.height(60.dp).width(200.dp)) {
+              drawRect(
+                brush = Brush.linearGradient(
+                  colors = listOf(
+                    Color.Transparent,
+                    CurrentColors.value.colors.surface,
+                  )
+                ),
+              )
+            }
+          }
+          IconButton(
+            onClick = onShowAllProfilesClicked,
+            enabled = !stopped,
+          ) {
+            Box(
+              contentAlignment = Alignment.CenterEnd
+            ) {
+              Icon(
+                painterResource(MR.images.ic_chevron_right),
+                stringResource(MR.strings.your_chat_profiles),
+                tint = MaterialTheme.colors.secondary,
+                modifier = Modifier.size(60.dp * fontSizeSqrtMultiplier)
+              )
+            }
           }
         }
       }
     }
+  } else {
+    UserPickerOptionRow(
+      painterResource(MR.images.ic_manage_accounts),
+      stringResource(MR.strings.your_chat_profiles),
+      onShowAllProfilesClicked
+    )
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
index 2a3195421d..bbdd861c9d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt
@@ -45,8 +45,7 @@ import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 
-@Composable
-private fun UserPickerOptionRow(icon: Painter, text: String, click: (() -> Unit)? = null, disabled: Boolean = false) {
+@Composable fun UserPickerOptionRow(icon: Painter, text: String, click: (() -> Unit)? = null, disabled: Boolean = false) {
   SectionItemView(click, disabled = disabled) {
     Icon(icon, text, tint = if (disabled) MaterialTheme.colors.secondary else MaterialTheme.colors.secondary)
     TextIconSpaced()
@@ -221,20 +220,12 @@ private fun GlobalSettingsSection(
   }
 
   SectionView {
-    if (users.isNotEmpty()) {
-      UserPickerInactiveUsersSection(
-        users = users,
-        onShowAllProfilesClicked = onShowAllProfilesClicked,
-        onUserClicked = onUserClicked,
-        stopped = stopped
-      )
-    } else {
-      UserPickerOptionRow(
-        painterResource(MR.images.ic_manage_accounts),
-        stringResource(MR.strings.your_chat_profiles),
-        onShowAllProfilesClicked
-      )
-    }
+    UserPickerInactiveUsersSection(
+      users = users,
+      onShowAllProfilesClicked = onShowAllProfilesClicked,
+      onUserClicked = onUserClicked,
+      stopped = stopped
+    )
 
     if (appPlatform.isAndroid) {
       val text = generalGetString(MR.strings.settings_section_title_use_from_desktop).lowercase().capitalize(Locale.current)