diff --git a/CHANGELIST.md b/CHANGELIST.md
index 27d655ec..13252802 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -4,6 +4,7 @@
 - Add path variants for PlayStation info
 - Convert Drive to use paths internally
 - Create skeleton for first-run
+- Show options window on first run
 
 ### 2.7.2 (2023-10-17)
 
diff --git a/MPF.UI.Core/Windows/MainWindow.xaml.cs b/MPF.UI.Core/Windows/MainWindow.xaml.cs
index 6cc4442f..02018995 100644
--- a/MPF.UI.Core/Windows/MainWindow.xaml.cs
+++ b/MPF.UI.Core/Windows/MainWindow.xaml.cs
@@ -57,7 +57,10 @@ namespace MPF.UI.Core.Windows
             // Handle first-run, if necessary
             if (MainViewModel.Options.FirstRun)
             {
-                // TODO: Show a welcome screen or the options window
+                // Show the options window
+                ShowOptionsWindow();
+
+                // Ensure the first run flag is unset
                 var continuingOptions = new MPF.Core.Data.Options(MainViewModel.Options);
                 continuingOptions.FirstRun = false;
                 MainViewModel.Options = continuingOptions;