1 files changed, 3 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 855f063fc..cad54c848 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -541,6 +541,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                             ActiveMachine.SerialNumber = machineCreationDialogVM.SerialNumber;
                             ActiveMachine.Name = machineCreationDialogVM.Name;
                             ActiveMachine.Type = machineCreationDialogVM.MachineType;
+                            ActiveMachine.MachineVersion = ActiveMachineAdapter.MachineVersions.First(x => x.MachineType == machineCreationDialogVM.MachineType);
                             ActiveMachineAdapter.Context.Machines.Add(ActiveMachine);
                         }
                         else
@@ -549,7 +550,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                             {
                                 initHwConfig = false;
                                 ActiveMachine = machineCreationDialogVM.SelectedPrototype.CreateMachine(machineCreationDialogVM.SerialNumber, machineCreationDialogVM.Name);
-                                ActiveMachine.MachineVersion = ActiveMachineAdapter.MachineVersions.FirstOrDefault(x => x.Guid == ActiveMachine.MachineVersionGuid);
+                                ActiveMachine.MachineVersion = ActiveMachineAdapter.MachineVersions.First(x => x.MachineType == machineCreationDialogVM.MachineType);
 
                                 if (machineCreationDialogVM.SelectedHardwareVersion != null)
                                 {
@@ -862,7 +863,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             vm.IsNewMachine = true;
             vm.Prototypes = prototypes.ToList();
             vm.HardwareVersions = hardwareVersions.OrderByDescending(x => x.Version).ToList();
-            vm.SelectedHardwareVersion = vm.HardwareVersions.FirstOrDefault();
+            vm.SelectedHardwareVersion = vm.HardwareVersions.Where(x => x.ForMachineType == MachineTypes.TS1800).FirstOrDefault();
             _notification.ShowModalDialog<MachineCreationDialogVM, Views.MachineCreationDialog>(vm, (x) =>
             {
                 using (ObservablesContext db = ObservablesContext.CreateDefault())