1 files changed, 10 insertions, 1 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 fcbdc90a3..fdab1a93c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -1,4 +1,5 @@
-using System;
+using GalaSoft.MvvmLight.Ioc;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
@@ -275,14 +276,22 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             IsMenuOpened = false;
 
+            foreach (var m in StudioModuleLoader.AllModules.Where(x => x != module))
+            {
+                m.IsLoaded = false;
+            }
+
             if (module != null)
             {
                 CurrentModule = module;
+                CurrentModule.IsLoaded = true;
                 IsModuleLoaded = true;
+                View.NavigateToModule(module);
             }
             else
             {
                 IsModuleLoaded = false;
+                View.NavigateToModule(null);
             }
         }