diff --git a/SteamTools/App.xaml b/SteamTools/App.xaml
index 64742492a9b..6918471c6ce 100644
--- a/SteamTools/App.xaml
+++ b/SteamTools/App.xaml
@@ -2,7 +2,6 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			 xmlns:s="clr-namespace:System;assembly=mscorlib"
-             ShutdownMode="OnExplicitShutdown"
 			 xmlns:converters="http://schemes.grabacr.net/winfx/2015/personal/converters">
     <Application.Resources>
         <ResourceDictionary>
diff --git a/SteamTools/App.xaml.cs b/SteamTools/App.xaml.cs
index 0fe1c767fc4..b4ababf769c 100644
--- a/SteamTools/App.xaml.cs
+++ b/SteamTools/App.xaml.cs
@@ -68,6 +68,7 @@ protected override void OnStartup(StartupEventArgs e)
                 }
                 Logger.EnableTextLog = true;
 #endif
+                App.Current.ShutdownMode = ShutdownMode.OnExplicitShutdown;
                 this.DispatcherUnhandledException += App_DispatcherUnhandledException;
                 DispatcherHelper.UIDispatcher = this.Dispatcher;
                 if (e.Args.ContainsArg("-log"))
@@ -86,7 +87,7 @@ protected override void OnStartup(StartupEventArgs e)
                 GeneralSettings.Culture.Subscribe(x => ResourceService.Current.ChangeCulture(x)).AddTo(this);
                 WindowService.Current.AddTo(this).Initialize();
                 ProxyService.Current.Initialize();
-                SteamConnectService.Current.Initialize(); 
+                SteamConnectService.Current.Initialize();
                 AuthService.Current.Initialize();
                 if (GeneralSettings.IsAutoCheckUpdate)
                 {
@@ -140,7 +141,7 @@ private void App_DispatcherUnhandledException(object sender, System.Windows.Thre
             catch (Exception ex)
             {
                 Debug.WriteLine(ex);
-                MessageBox.Show(ex.Message, "Error");
+                MessageBox.Show(ex.Message, $"{ProductInfo.Title} {ProductInfo.VersionString} Error");
             }
 
             Current.Shutdown();
@@ -177,6 +178,7 @@ private void ProcessCommandLineParameter(string[] args)
             }
             if (args.ContainsArg("-app", out int appid))
             {
+                App.Current.ShutdownMode = ShutdownMode.OnMainWindowClose;
                 ThemeService.Current.Register(this, Theme.Windows, Accent.Windows);
                 new SettingsPageViewModel();
                 WindowService.Current.AddTo(this).Initialize(appid);
diff --git a/SteamTools/Services/ProxyService.cs b/SteamTools/Services/ProxyService.cs
index 6e3115d90b9..25acdf69637 100644
--- a/SteamTools/Services/ProxyService.cs
+++ b/SteamTools/Services/ProxyService.cs
@@ -49,7 +49,8 @@ public void Initialize()
 Index=0,
 Name=Resources.SteamCommunity,
 Domains = new List<string>{"steamcommunity.com" },
-ToDomain = "steamcommunity-a.akamaihd.net",
+//ToDomain = "steamcommunity-a.akamaihd.net",
+ToDomain = "steampowered.com",
 Hosts = new List<string>{ "steamcommunity.com", "www.steamcommunity.com"},
 DomainTag = DomainTag.SteamCommunity,
 IsEnable= true,
@@ -58,7 +59,8 @@ public void Initialize()
 Index=1,
 Name=Resources.SteamStore,
 Domains = new List<string>{"steampowered.com" },
-ToDomain = "steamstore-a.akamaihd.net",
+//ToDomain = "steamstore-a.akamaihd.net",
+ToDomain = "steampowered.com",
 Hosts = new List<string>{ "store.steampowered.com", "api.steampowered.com"},
 DomainTag = DomainTag.SteamStore,
 IsEnable= false,
@@ -77,7 +79,8 @@ public void Initialize()
 Index=3,
 Name=Resources.SteamChat,
 Domains = new List<string>{"steam-chat.com" },
-ToDomain = "steamstore-a.akamaihd.net",
+//ToDomain = "steamstore-a.akamaihd.net",
+ToDomain = "steampowered.com",
 Hosts = new List<string>{ "steam-chat.com"},
 DomainTag = DomainTag.SteamChat,
 IsEnable= false,