diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchAllServicesScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchAllServicesScreen.kt
index 3aa2b6e6c6a..50885b115a9 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchAllServicesScreen.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchAllServicesScreen.kt
@@ -39,6 +39,7 @@ import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.progress.CenteredCircularProgressBarIndicator
 import com.wire.android.ui.home.conversations.search.widget.SearchFailureBox
 import com.wire.android.ui.home.newconversation.model.Contact
+import com.wire.android.util.extension.folderWithElements
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
@@ -106,36 +107,35 @@ private fun SuccessServicesList(
             modifier = Modifier
                 .weight(1f)
         ) {
-            services
-                .forEach {
-                    item {
-                        RowItemTemplate(
-                            leadingIcon = {
-                                Row {
-                                    UserProfileAvatar(it.avatarData)
-                                }
-                            },
-                            titleStartPadding = dimensions().spacing0x,
-                            title = {
-                                Row(verticalAlignment = Alignment.CenterVertically) {
-                                    HighlightName(
-                                        name = it.name,
-                                        searchQuery = searchQuery,
-                                        modifier = Modifier.weight(weight = 1f, fill = false)
-                                    )
-                                    UserBadge(
-                                        membership = it.membership,
-                                        connectionState = it.connectionState,
-                                        startPadding = dimensions().spacing8x
-                                    )
-                                }
-                            },
-                            actions = {},
-                            clickable = remember { Clickable(enabled = true) { onServiceClicked(it) } },
-                            modifier = Modifier.padding(start = dimensions().spacing8x)
-                        )
-                    }
-                }
+            folderWithElements(
+                items = services.associateBy { it.id }
+            ) {
+                RowItemTemplate(
+                    leadingIcon = {
+                        Row {
+                            UserProfileAvatar(it.avatarData)
+                        }
+                    },
+                    titleStartPadding = dimensions().spacing0x,
+                    title = {
+                        Row(verticalAlignment = Alignment.CenterVertically) {
+                            HighlightName(
+                                name = it.name,
+                                searchQuery = searchQuery,
+                                modifier = Modifier.weight(weight = 1f, fill = false)
+                            )
+                            UserBadge(
+                                membership = it.membership,
+                                connectionState = it.connectionState,
+                                startPadding = dimensions().spacing8x
+                            )
+                        }
+                    },
+                    actions = {},
+                    clickable = remember(it) { Clickable(enabled = true) { onServiceClicked(it) } },
+                    modifier = Modifier.padding(start = dimensions().spacing8x)
+                )
+            }
         }
     }
 }