diff --git a/DS4Windows/App.xaml b/DS4Windows/App.xaml
index f84b267..fdd500c 100644
--- a/DS4Windows/App.xaml
+++ b/DS4Windows/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:DS4WinWPF"
-             Startup="Application_Startup" Exit="Application_Exit" ShutdownMode="OnExplicitShutdown">
+             Startup="Application_Startup" Exit="Application_Exit" ShutdownMode="OnExplicitShutdown" SessionEnding="Application_SessionEnding">
     <Application.Resources>
         <Style TargetType="{x:Type Button}" x:Key="NoBGHoverBtn">
             <Setter Property="Background" Value="Transparent" />
diff --git a/DS4Windows/App.xaml.cs b/DS4Windows/App.xaml.cs
index 1927afc..edece72 100644
--- a/DS4Windows/App.xaml.cs
+++ b/DS4Windows/App.xaml.cs
@@ -429,6 +429,20 @@ namespace DS4WinWPF
         }
 
         private void Application_Exit(object sender, ExitEventArgs e)
+        {
+            Logger logger = logHolder.Logger;
+            logger.Info("Request App Shutdown");
+            CleanShutdown();
+        }
+
+        private void Application_SessionEnding(object sender, SessionEndingCancelEventArgs e)
+        {
+            Logger logger = logHolder.Logger;
+            logger.Info("User Session Ending");
+            CleanShutdown();
+        }
+
+        private void CleanShutdown()
         {
             if (runShutdown)
             {
@@ -456,6 +470,9 @@ namespace DS4WinWPF
 
                 if (ipcClassNameMMA != null) ipcClassNameMMA.Dispose();
                 if (ipcClassNameMMF != null) ipcClassNameMMF.Dispose();
+
+                LogManager.Flush();
+                LogManager.Shutdown();
             }
         }
     }