1 files changed, 4 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 934932438..31c20eda4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
 using Tango.Core.Commands;
-using Tango.BL.Observables;
+using Tango.BL.Entities;
 using Tango.Integration.Operation;
 using Tango.Integration.Services;
 using Tango.Logging;
@@ -24,6 +24,7 @@ using Tango.MachineStudio.Developer.Views;
 using Tango.Settings;
 using Tango.SharedUI;
 using Tango.Transport;
+using Tango.BL;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -592,6 +593,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
             LogManager.Log("Initializing machine Db context...");
             _machineDbContext = ObservablesContext.CreateDefault();
 
+            Machines = _machineDbContext.Machines.ToObservableCollection();
+
             if (SettingsManager.Default.MachineStudio.DeveloperModule.LastSelectedMachineGuid != null)
             {
                 LogManager.Log("Setting last selected machine from settings...");
@@ -604,7 +607,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 SelectedMachineJob = SelectedMachine.Jobs.SingleOrDefault(x => x.Guid == SettingsManager.Default.MachineStudio.DeveloperModule.LastSelectedJobGuid);
             }
 
-
             _authentication = authentication;
 
             _notification = notificationProvider;