1 files changed, 7 insertions, 5 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index b95a74a3e..ea4234fd8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -23,9 +23,13 @@ namespace Tango.MachineStudio.UI.StudioApplication
             _navigationManager = navigationManager;
         }
 
+        public bool IsShuttingDown { get; private set; }
+
         public async void ShutDown()
         {
-            _navigationManager.NavigateTo(NavigationView.ShutdownView);
+            if (IsShuttingDown) return;
+
+            IsShuttingDown = true;
 
             await Task.Factory.StartNew(async () =>
             {
@@ -36,14 +40,12 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     var result = await vm.OnShutdownRequest();
                     if (!result)
                     {
-                        ThreadsHelper.InvokeUI(() =>
-                        {
-                            _navigationManager.NavigateTo(NavigationView.MainView);
-                        });
+                        IsShuttingDown = false;
                         return;
                     }
                 }
 
+                _navigationManager.NavigateTo(NavigationView.ShutdownView);
                 Thread.Sleep(3000);
                 Environment.Exit(0);