diff --git a/PadelClub/Data/MatchScheduler.swift b/PadelClub/Data/MatchScheduler.swift
index 3e7c92c..6c71fe4 100644
--- a/PadelClub/Data/MatchScheduler.swift
+++ b/PadelClub/Data/MatchScheduler.swift
@@ -93,9 +93,12 @@ final class MatchScheduler : ModelObject, Storable {
     }
     
     @discardableResult
-    func updateGroupStageSchedule(tournament: Tournament) -> Date {
+    func updateGroupStageSchedule(tournament: Tournament, specificGroupStage: GroupStage? = nil) -> Date {
         let computedGroupStageChunkCount = groupStageChunkCount ?? tournament.getGroupStageChunkValue()
-        let groupStages: [GroupStage] = tournament.groupStages()
+        var groupStages: [GroupStage] = tournament.groupStages()
+        if let specificGroupStage {
+            groupStages = [specificGroupStage]
+        }
         let numberOfCourtsAvailablePerRotation: Int = tournament.courtCount
 
         let matches = groupStages.flatMap { $0._matches() }
diff --git a/PadelClub/Views/Planning/GroupStageScheduleEditorView.swift b/PadelClub/Views/Planning/GroupStageScheduleEditorView.swift
index d0245c7..32d2347 100644
--- a/PadelClub/Views/Planning/GroupStageScheduleEditorView.swift
+++ b/PadelClub/Views/Planning/GroupStageScheduleEditorView.swift
@@ -27,8 +27,9 @@ struct GroupStageScheduleEditorView: View {
     }
     
     var body: some View {
-        DatePickingView(title: groupStage.groupStageTitle(), startDate: $startDate, currentDate: $groupStage.startDate, duration: groupStage.matchFormat.getEstimatedDuration(tournament.additionalEstimationDuration)) {
+        GroupStageDatePickingView(title: groupStage.groupStageTitle(), startDate: $startDate, currentDate: $groupStage.startDate, duration: groupStage.matchFormat.getEstimatedDuration(tournament.additionalEstimationDuration)) {
             groupStage.startDate = startDate
+            tournament.matchScheduler()?.updateGroupStageSchedule(tournament: tournament, specificGroupStage: groupStage)
             _save()
         }
     }