diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleStateProvider.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleStateProvider.kt
index fc4f4d2648..37428071d7 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleStateProvider.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleStateProvider.kt
@@ -19,32 +19,28 @@ package io.element.android.features.createroom.impl.addpeople
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.selectusers.api.aSelectUsersState
 import io.element.android.features.selectusers.api.aSetOfSelectedUsers
-import io.element.android.libraries.designsystem.components.avatar.AvatarData
-import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.ui.model.MatrixUser
 
 open class AddPeopleStateProvider : PreviewParameterProvider<AddPeopleState> {
     override val values: Sequence<AddPeopleState>
         get() = sequenceOf(
             aAddPeopleState(),
             aAddPeopleState().copy(
-                selectUsersState = aSelectUsersState().copy(selectedUsers = aSetOfSelectedUsers())
+                selectUsersState = aSelectUsersState().copy(
+                    selectedUsers = aSetOfSelectedUsers(),
+                    isMultiSelectionEnabled = true,
+                )
             ),
-            aAddPeopleState(isSearchActive = true),
-            aAddPeopleState(isSearchActive = true).copy(
-                selectUsersState = aSelectUsersState().copy(selectedUsers = aSetOfSelectedUsers())
+            aAddPeopleState().copy(
+                selectUsersState = aSelectUsersState().copy(
+                    selectedUsers = aSetOfSelectedUsers(),
+                    isSearchActive = true,
+                    isMultiSelectionEnabled = true,
+                )
             )
         )
 }
 
-fun aAddPeopleState(isSearchActive: Boolean = false) = AddPeopleState(
-    selectUsersState = aSelectUsersState().copy(
-        isMultiSelectionEnabled = true,
-        isSearchActive = isSearchActive,
-    ),
+fun aAddPeopleState() = AddPeopleState(
+    selectUsersState = aSelectUsersState(),
     eventSink = {}
 )
-
-fun aMatrixUser(userName: String): MatrixUser {
-    return MatrixUser(id = UserId("@id"), username = userName, avatarData = AvatarData("@id", "U"))
-}
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
index acecb7bb95..842256d9c3 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
@@ -51,11 +51,13 @@ fun AddPeopleView(
 
     Scaffold(
         topBar = {
-            AddPeopleViewTopBar(
-                hasSelectedUsers = state.selectUsersState.selectedUsers.isNotEmpty(),
-                onBackPressed = onBackPressed,
-                onNextPressed = onNextPressed,
-            )
+            if (!state.selectUsersState.isSearchActive) {
+                AddPeopleViewTopBar(
+                    hasSelectedUsers = state.selectUsersState.selectedUsers.isNotEmpty(),
+                    onBackPressed = onBackPressed,
+                    onNextPressed = onNextPressed,
+                )
+            }
         }
     ) { padding ->
         Column(