diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift
index e927f14..aa8d85a 100644
--- a/PadelClub/Data/Tournament.swift
+++ b/PadelClub/Data/Tournament.swift
@@ -1941,9 +1941,11 @@ defer {
         return bracketTeamCount
     }
 
-    func buildBracket() {
+    func buildBracket(minimalBracketTeamCount: Int? = nil) {
         guard rounds().isEmpty else { return }
-        let roundCount = RoundRule.numberOfRounds(forTeams: bracketTeamCount())
+        let roundCount = RoundRule.numberOfRounds(forTeams: minimalBracketTeamCount ?? bracketTeamCount())
+        let matchCount = RoundRule.numberOfMatches(forTeams: minimalBracketTeamCount ?? bracketTeamCount())
+
         
         let rounds = (0..<roundCount).map { //index 0 is the final
             return Round(tournament: id, index: $0, matchFormat: roundSmartMatchFormat($0), loserBracketMode: loserBracketMode)
@@ -1958,7 +1960,6 @@ defer {
         } catch {
             Logger.error(error)
         }
-        let matchCount = RoundRule.numberOfMatches(forTeams: bracketTeamCount())
 
         let matches = (0..<matchCount).map { //0 is final match
             let roundIndex = RoundRule.roundIndex(fromMatchIndex: $0)
diff --git a/PadelClub/Views/Tournament/Screen/RegistrationSetupView.swift b/PadelClub/Views/Tournament/Screen/RegistrationSetupView.swift
index 13c38d2..7287b1b 100644
--- a/PadelClub/Views/Tournament/Screen/RegistrationSetupView.swift
+++ b/PadelClub/Views/Tournament/Screen/RegistrationSetupView.swift
@@ -255,7 +255,7 @@ struct RegistrationSetupView: View {
         }
 
         .onChange(of: targetTeamCount) {
-            displayWarning = true
+            displayWarning = targetTeamCount != tournament.teamCount
             _hasChanged()
         }
 
diff --git a/PadelClub/Views/Tournament/Screen/TableStructureView.swift b/PadelClub/Views/Tournament/Screen/TableStructureView.swift
index 1d8b8a0..4f5f95d 100644
--- a/PadelClub/Views/Tournament/Screen/TableStructureView.swift
+++ b/PadelClub/Views/Tournament/Screen/TableStructureView.swift
@@ -98,7 +98,7 @@ struct TableStructureView: View {
                     Text("Nombre d'équipes")
                 }
                 .onChange(of: teamCount) {
-                    displayWarning = true
+                    displayWarning = teamCount != tournament.teamCount
                 }
                 LabeledContent {
                     StepperView(count: $groupStageCount, minimum: 0, maximum: maxGroupStages) {
@@ -261,6 +261,16 @@ struct TableStructureView: View {
                 }
             }
             
+            if tournament.rounds().isEmpty {
+                Section {
+                    RowButtonView("Ajouter un tableau", role: .destructive) {
+                        tournament.buildBracket(minimalBracketTeamCount: 4)
+                    }
+                } footer: {
+                    Text("Vous pourrez ensuite modifier le nombre de tour dans l'écran de réglages du tableau.")
+                }
+            }
+            
             
             if tournament.state() != .initial {
                 Section {