diff --git a/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPageContext.cs b/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPageContext.cs
index 862d2fffd..80da751a5 100644
--- a/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPageContext.cs
+++ b/src/Ryujinx/UI/SetupWizard/Pages/GameDirs/SetupGameDirsPageContext.cs
@@ -31,9 +31,12 @@ namespace Ryujinx.UI.SetupWizard.Pages
                 return Result.Fail;
             }
 
-            ConfigurationState.Instance.UI.GameDirs.Value = GameDirs.ToList();
-            ConfigurationState.Instance.UI.AutoloadDirs.Value = UpdateAndDlcDirs.ToList();
-            OwningWizard.SignalConfigModified();
+            OwningWizard.ModifyConfig(config =>
+            {
+                config.UI.GameDirs.Value = GameDirs.ToList();
+                config.UI.AutoloadDirs.Value = UpdateAndDlcDirs.ToList();
+            });
+
             RyujinxApp.MainWindow.LoadApplications();
 
             return Result.Success;
diff --git a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
index c2513bffa..1d8b5c69f 100644
--- a/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
+++ b/src/Ryujinx/UI/SetupWizard/RyujinxSetupWizard.cs
@@ -57,15 +57,16 @@ namespace Ryujinx.Ava.UI.SetupWizard
                 .WithTitle(boundContext.Title)
                 .WithActionContent(boundContext.ActionContent);
 
-        public void SignalConfigModified()
-        {
-            _configWasModified = true;
-        }
-
         public static bool HasFirmware => RyujinxApp.MainWindow.ContentManager.GetCurrentFirmwareVersion() != null;
 
         public RyujinxNotificationManager NotificationManager { get; private set; }
 
+        internal void ModifyConfig(Action<ConfigurationState> modifier)
+        {
+            modifier(ConfigurationState.Instance);
+            _configWasModified = true;
+        }
+
         public async Task Start()
         {
             NotificationManager = _window.CreateNotificationManager(