diff --git a/PadelClub/Views/Shared/SelectablePlayerListView.swift b/PadelClub/Views/Shared/SelectablePlayerListView.swift
index 6c3b1d9..9b61575 100644
--- a/PadelClub/Views/Shared/SelectablePlayerListView.swift
+++ b/PadelClub/Views/Shared/SelectablePlayerListView.swift
@@ -171,7 +171,8 @@ struct SelectablePlayerListView: View {
                     }
                     .scrollDismissesKeyboard(.immediately)
                     .navigationBarBackButtonHidden(searchViewModel.allowMultipleSelection)
-                    //.toolbarBackground(.visible, for: .bottomBar)
+                    .toolbarBackground(searchViewModel.allowMultipleSelection ? .visible : .hidden, for: .bottomBar)
+                    .toolbarBackground(.visible, for: .navigationBar)
 //                    .toolbarRole(searchViewModel.allowMultipleSelection ? .navigationStack : .editor)
                     .interactiveDismissDisabled(searchViewModel.selectedPlayers.isEmpty == false)
                     .navigationTitle(searchViewModel.label(forDataSet: searchViewModel.dataSet))
@@ -247,22 +248,21 @@ struct SelectablePlayerListView: View {
                     }
                 }
                 
-                if searchViewModel.selectedPlayers.isEmpty == false {
-                    ToolbarItem(placement: .topBarTrailing) {
-                        ButtonValidateView {
-                            if let playerSelectionAction {
-                                playerSelectionAction(searchViewModel.selectedPlayers)
-                            }
-                            dismiss()
+                ToolbarItem(placement: .topBarTrailing) {
+                    ButtonValidateView {
+                        if let playerSelectionAction {
+                            playerSelectionAction(searchViewModel.selectedPlayers)
                         }
+                        dismiss()
                     }
-                    ToolbarItem(placement: .status) {
-                        let count = searchViewModel.selectedPlayers.count
-                        VStack(spacing: 0) {
-                            Text(count.formatted() + " joueur" + count.pluralSuffix + " séléctionné" + count.pluralSuffix).font(.footnote).foregroundStyle(.secondary)
-                            FooterButtonView("\(searchViewModel.filterSelectionEnabled ? "masquer" : "voir") la liste") {
-                                searchViewModel.filterSelectionEnabled.toggle()
-                            }
+                    .disabled(searchViewModel.selectedPlayers.isEmpty)
+                }
+                ToolbarItem(placement: .status) {
+                    let count = searchViewModel.selectedPlayers.count
+                    VStack(spacing: 0) {
+                        Text(count.formatted() + " joueur" + count.pluralSuffix + " séléctionné" + count.pluralSuffix).font(.footnote).foregroundStyle(.secondary)
+                        FooterButtonView("\(searchViewModel.filterSelectionEnabled ? "masquer" : "voir") la liste") {
+                            searchViewModel.filterSelectionEnabled.toggle()
                         }
                     }
                 }
diff --git a/PadelClub/Views/Tournament/Screen/AddTeamView.swift b/PadelClub/Views/Tournament/Screen/AddTeamView.swift
index 431e7a1..71aebc0 100644
--- a/PadelClub/Views/Tournament/Screen/AddTeamView.swift
+++ b/PadelClub/Views/Tournament/Screen/AddTeamView.swift
@@ -164,7 +164,7 @@ struct AddTeamView: View {
         }
         .sheet(isPresented: $presentPlayerSearch) {
             NavigationStack {
-                SelectablePlayerListView(allowSelection: -1, searchField: searchField, filterOption: _filterOption(), showFemaleInMaleAssimilation: tournament.tournamentCategory.showFemaleInMaleAssimilation) { players in
+                SelectablePlayerListView(allowSelection: 2 - _currentSelectionIds().count, isPresented: true, searchField: searchField, filterOption: _filterOption(), showFemaleInMaleAssimilation: tournament.tournamentCategory.showFemaleInMaleAssimilation) { players in
                     players.forEach { player in
                         let newPlayer = PlayerRegistration(importedPlayer: player)
                         newPlayer.setComputedRank(in: tournament)