diff --git a/src/UniGetUI/App.xaml.cs b/src/UniGetUI/App.xaml.cs
index a8bd907be..8dd47ad16 100644
--- a/src/UniGetUI/App.xaml.cs
+++ b/src/UniGetUI/App.xaml.cs
@@ -400,12 +400,14 @@ public async Task ShowMainWindowFromLaunchAsync()
 
         public async void DisposeAndQuit(int outputCode = 0)
         {
-            Logger.Warn("Quitting...");
+            Logger.Warn("Quitting UniGetUI");
+            DWMThreadHelper.ChangeState_DWM(false);
+            DWMThreadHelper.ChangeState_XAML(false);
             MainWindow?.Close();
             BackgroundApi?.Stop();
             Exit();
-            await Task.Delay(100);
-            Environment.Exit(outputCode);
+            // await Task.Delay(100);
+            // Environment.Exit(outputCode);
         }
 
         public void KillAndRestart()