diff --git a/samples/ControlCatalog/MainWindow.xaml.cs b/samples/ControlCatalog/MainWindow.xaml.cs
index cd55ad78a7..2446c0e1c9 100644
--- a/samples/ControlCatalog/MainWindow.xaml.cs
+++ b/samples/ControlCatalog/MainWindow.xaml.cs
@@ -19,7 +19,7 @@ namespace ControlCatalog
             this.InitializeComponent();
             this.AttachDevTools(new Avalonia.Diagnostics.DevToolsOptions()
             {
-                StartupScreen = 1,
+                StartupScreenIndex = 1,
             });
             //Renderer.DrawFps = true;
             //Renderer.DrawDirtyRects = Renderer.DrawFps = true;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index 4677f1ef9b..5336dca65b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -24,8 +24,8 @@ namespace Avalonia.Diagnostics
         public Size Size { get; set; } = new Size(1280, 720);
 
         /// <summary>
-        /// Get or set the startup screen number where the DevTools window will be displayed.
+        /// Get or set the startup screen index where the DevTools window will be displayed.
         /// </summary>
-        public int? StartupScreen { get; set; }
+        public int? StartupScreenIndex { get; set; }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index bf35641b40..3f367165ac 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -218,7 +218,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
         public void SetOptions(DevToolsOptions options)
         {
-            StartupScreenIndex = options.StartupScreen;
+            StartupScreenIndex = options.StartupScreenIndex;
         }
     }
 }