diff --git a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.desktop.kt b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.desktop.kt
index 636fddbd24..6714432db8 100644
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.desktop.kt
@@ -1,18 +1,16 @@
 package chat.simplex.common.views.chatlist
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.grid.*
-import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.User
 import chat.simplex.common.model.UserInfo
-import chat.simplex.common.platform.ColumnWithScrollBar
-import chat.simplex.common.platform.LazyColumnWithScrollBar
-import chat.simplex.common.ui.theme.DEFAULT_PADDING
-import chat.simplex.common.ui.theme.DEFAULT_PADDING_HALF
+import chat.simplex.common.platform.*
+import chat.simplex.common.ui.theme.*
+import chat.simplex.common.views.helpers.fontSizeSqrtMultiplier
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
@@ -27,12 +25,18 @@ actual fun UserPickerInactiveUsersSection(
   if (users.isNotEmpty()) {
     val userRows = users.chunked(5)
     val rowsToDisplay = if (userRows.count() > 2) 2 else userRows.count()
+    val horizontalPadding = DEFAULT_PADDING_HALF + 8.dp
+
+    Column(Modifier.padding(horizontal = horizontalPadding).height((55.dp + DEFAULT_PADDING) * rowsToDisplay)) {
+      ColumnWithScrollBar(
+        verticalArrangement = Arrangement.spacedBy(DEFAULT_PADDING)
+      ) {
+        val spaceBetween = (((DEFAULT_START_MODAL_WIDTH * fontSizeSqrtMultiplier) - (horizontalPadding)) - (55.dp * 5f)) / 5f
 
-    Column(Modifier.padding(horizontal = DEFAULT_PADDING).height((55.dp + DEFAULT_PADDING) * rowsToDisplay)) {
-      ColumnWithScrollBar(verticalArrangement = Arrangement.spacedBy(DEFAULT_PADDING)) {
         userRows.forEach { row ->
           Row(
-            horizontalArrangement = Arrangement.spacedBy(18.dp),
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(spaceBetween),
           ) {
             row.forEach { u ->
               UserPickerInactiveUserBadge(u, stopped, size = 55) {