1 files changed, 9 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index c7fd7a525..a7397835b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -668,7 +668,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// Starts the specified module.
         /// </summary>
         /// <param name="module">The module.</param>
-        internal void StartModule(IStudioModule module)
+        internal async void StartModule(IStudioModule module)
         {
             IsMenuOpened = false;
 
@@ -693,10 +693,9 @@ namespace Tango.MachineStudio.UI.ViewModels
                 m.IsLoaded = false;
             }
 
-            CurrentModule = module;
-
             if (module != null)
             {
+                CurrentModule = module;
                 CurrentModule.IsLoaded = true;
                 IsModuleLoaded = true;
 
@@ -707,7 +706,10 @@ namespace Tango.MachineStudio.UI.ViewModels
             {
                 IsModuleLoaded = false;
                 LogManager.Log(String.Format("Navigating to Home..."));
-                (MainView.Self as MainView).NavigationControl.NavigateTo("Home");
+                (MainView.Self as MainView).NavigationControl.NavigateTo("Home",() => 
+                {
+                    CurrentModule = module;
+                });
             }
         }
 
@@ -715,7 +717,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// Opens the module in a new window.
         /// </summary>
         /// <param name="module">The module.</param>
-        private void OpenModuleInWindow(IStudioModule module, Rect? bounds = null, WindowState? state = null)
+        private async void OpenModuleInWindow(IStudioModule module, Rect? bounds = null, WindowState? state = null)
         {
             if (module == null) return;
 
@@ -725,6 +727,8 @@ namespace Tango.MachineStudio.UI.ViewModels
 
                 StartModule(null);
 
+                await Task.Delay(1000);
+
                 LogManager.Log(String.Format("Starting module '{0}' in new window...", module.Name));
 
                 if (!(MainView.Self as MainView).NavigationControl.Elements.ToList().Exists(x => x.GetType() == module.MainViewType))