diff --git a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
index df8b490bd6..151f8f3bdc 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
@@ -356,6 +356,7 @@ namespace Microsoft.PowerToys.Settings.UI
                 scoobeWindow.Closed += (_, _) =>
                 {
                     scoobeWindow = null;
+                    settingsWindow?.CloseHiddenWindow();
                 };
 
                 scoobeWindow.Activate();
@@ -377,6 +378,7 @@ namespace Microsoft.PowerToys.Settings.UI
                 oobeWindow.Closed += (_, _) =>
                 {
                     oobeWindow = null;
+                    settingsWindow?.CloseHiddenWindow();
                 };
 
                 oobeWindow.Activate();
@@ -396,6 +398,7 @@ namespace Microsoft.PowerToys.Settings.UI
                 shortcutConflictWindow.Closed += (_, _) =>
                 {
                     shortcutConflictWindow = null;
+                    settingsWindow?.CloseHiddenWindow();
                 };
 
                 shortcutConflictWindow.Activate();