diff --git a/CRSim/Views/Windows/Dialogs/StationStopDialog.xaml.cs b/CRSim/Views/Windows/Dialogs/StationStopDialog.xaml.cs
index e236c99..f68313d 100644
--- a/CRSim/Views/Windows/Dialogs/StationStopDialog.xaml.cs
+++ b/CRSim/Views/Windows/Dialogs/StationStopDialog.xaml.cs
@@ -108,6 +108,8 @@ namespace CRSim.Views
             {
                 Platforms.Add(s);
             }
+            PlatformComboBox.SelectedIndex = Platforms.IndexOf(stationStop.Platform);
+            LandmarkComboBox.SelectedIndex = stationStop.Landmark == null ? 0 : Landmarks.IndexOf(stationStop.Landmark);
             ValidateInput();
         }