diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs
index 4d5d569..fb861ca 100644
--- a/src/DesktopMagic/MainWindow.xaml.cs
+++ b/src/DesktopMagic/MainWindow.xaml.cs
@@ -245,8 +245,14 @@ namespace DesktopMagic
                     window.PluginLoaded -= onPluginLoaded;
                 });
             };
+
             window.OnExit += () =>
             {
+                Windows.Remove(window);
+                WindowNames.Remove(window.Title);
+                blockWindowsClosing = false;
+                window.Close();
+                blockWindowsClosing = true;
                 pluginSettings.Enabled = false;
             };
             window.PluginLoaded += onPluginLoaded;