1 files changed, 13 insertions, 1 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 00ee4f3bd..2333bf60a 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
@@ -188,6 +188,13 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _tupViewVM = value; RaisePropertyChangedAuto(); }
         }
 
+        private List<String> _tags;
+        public List<String> Tags
+        {
+            get { return _tags; }
+            set { _tags = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -299,7 +306,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         public override void OnApplicationReady()
         {
-            
+
         }
 
         private void OnDispensersFilterChanged()
@@ -494,6 +501,11 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     ActiveMachineAdapter.MachineVersions = (await ActiveMachineAdapter.Context.MachineVersions.ToListAsync()).ToObservableCollection();
                     ActiveMachineAdapter.Organizations = (await ActiveMachineAdapter.Context.Organizations.ToListAsync()).ToObservableCollection();
 
+                    var tags = (await ActiveMachineAdapter.Context.TangoVersions.Select(x => x.Tag).Where(x => x != null).Distinct().ToListAsync());
+                    tags.Insert(0, null);
+
+                    Tags = tags;
+
                     bool initHwConfig = true;
 
                     Configuration machineConfigBeforeClone = null;