1 files changed, 6 insertions, 0 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index df13c1482..5bc79dec7 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -726,6 +726,12 @@ namespace HandBrakeWPF.ViewModels
                 this.CurrentTask.PointToPointMode = value;
                 this.NotifyOfPropertyChange(() => SelectedPointToPoint);
                 this.NotifyOfPropertyChange(() => ShowTextEntryForPointToPointMode);
+
+                if (value == PointToPointMode.Chapters && this.SelectedTitle != null)
+                {
+                    this.SelectedStartPoint = 1;
+                    this.SelectedEndPoint = selectedTitle.Chapters.Last().ChapterNumber;
+                }
             }
         }