1 files changed, 7 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
index 2835ef102..27c4bc7a0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs
@@ -25,9 +25,15 @@ namespace Tango.MachineStudio.DB.ViewModels
             if (module is DBModule && args != null && args is IObservableEntity)
             {
                 String vmName = args.GetType().Name + "sViewVM";
-
+                
                 Type vmType = Assembly.GetAssembly(typeof(MainViewVM)).GetTypes().SingleOrDefault(x => x.Name == vmName);
 
+                if (vmType == null)
+                {
+                    vmName = args.GetType().BaseType.Name + "sViewVM";
+                    vmType = Assembly.GetAssembly(typeof(MainViewVM)).GetTypes().SingleOrDefault(x => x.Name == vmName);
+                }
+
                 if (vmType != null)
                 {
                     var vm = ServiceLocator.Current.GetInstance(vmType);