diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
index 18209f0ac..76f456d16 100644
--- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
+++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
 using Avalonia.Media.Imaging;
 using Avalonia.Styling;
@@ -22,6 +23,12 @@ namespace Ryujinx.Ava.UI.SetupWizard
         private readonly RyujinxSetupWizardWindow _window;
         private readonly bool _overwrite;
 
+        public void SetWindowTitle(string titleText)
+        {
+            _window.Title = titleText;
+            ToolTip.SetTip(_window.RyuLogo, titleText);
+        }
+
         public RyujinxSetupWizard(RyujinxSetupWizardWindow wizardWindow, bool overwriteMode)
         {
             _window = wizardWindow;
@@ -32,6 +39,10 @@ namespace Ryujinx.Ava.UI.SetupWizard
                 UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle);
                 RyujinxApp.ThemeChanged += Ryujinx_ThemeChanged;
             }
+            else
+            {
+                UpdateLogoTheme("Dark");
+            }
         }
 
         private SetupWizardPage FirstPage() => new(_window.WizardPresenter, this, isFirstPage: true);
@@ -55,6 +66,9 @@ namespace Ryujinx.Ava.UI.SetupWizard
 
         public RyujinxNotificationManager NotificationManager { get; private set; }
 
+        [ObservableProperty]
+        public partial SetupWizardPage CurrentPage { get; set; }
+
         public async Task Start()
         {
             NotificationManager = _window.CreateNotificationManager(
diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml
index d04c6f391..ae133d9d7 100644
--- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml
+++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizardWindow.axaml
@@ -2,18 +2,16 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
         xmlns:windows="clr-namespace:Ryujinx.Ava.UI.Windows"
         xmlns:setupWizard="clr-namespace:Ryujinx.Ava.UI.SetupWizard"
         xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
         CanResize="False"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Ryujinx.Ava.UI.SetupWizard.RyujinxSetupWizardWindow"
-        x:DataType="setupWizard:RyujinxSetupWizard"
-        Title="{ext:Locale SetupWizardFirstPageTitle}">
+        x:DataType="setupWizard:RyujinxSetupWizard">
     <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" RowDefinitions="Auto,*">
         <Grid Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Name="FlushControls">
-            <controls:RyujinxLogo ToolTip.Tip="{ext:Locale SetupWizardFirstPageTitle}"/>
+            <controls:RyujinxLogo Name="RyuLogo"/>
         </Grid>
         <ContentPresenter Grid.Row="1" Name="WizardPresenter"/>
     </Grid>
diff --git a/src/Ryujinx/UI/SetupWizard/SetupWizardPage.cs b/src/Ryujinx/UI/SetupWizard/SetupWizardPage.cs
index bdea37a01..cdd2955b0 100644
--- a/src/Ryujinx/UI/SetupWizard/SetupWizardPage.cs
+++ b/src/Ryujinx/UI/SetupWizard/SetupWizardPage.cs
@@ -50,6 +50,7 @@ namespace Ryujinx.Ava.UI.SetupWizard
         public async ValueTask<bool> Show()
         {
             contentPresenter.Content = new SetupWizardPageView { ViewModel = this };
+            ownerWizard.SetWindowTitle(Title);
 
             try
             {