1 files changed, 6 insertions, 5 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
index db72055df..7f6dd8d5f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
@@ -10,9 +10,9 @@ using Tango.MachineStudio.DB.Managers;
 using Tango.SharedUI;
 using Tango.MachineStudio.DB.ExtensionMethods;
 
-namespace Tango.MachineStudio.DB.ViewModels.DBViewModels
+namespace Tango.MachineStudio.DB.ViewModels
 {
-    public abstract class DbTableViewModel<T> : ViewModel where T : IObservableEntity
+    public abstract class DbTableViewModel<T> : ViewModel where T : class, IObservableEntity
     {
         private INotificationProvider _notification;
 
@@ -25,8 +25,8 @@ namespace Tango.MachineStudio.DB.ViewModels.DBViewModels
             Adapter = ObservablesEntitiesAdapter.Instance;
 
             AddCommand = new RelayCommand(OnAdd);
-            EditCommand = new RelayCommand(OnEdit);
-            DeleteCommand = new RelayCommand(OnDelete);
+            EditCommand = new RelayCommand(OnEdit,(x) => SelectedEntity != null);
+            DeleteCommand = new RelayCommand(OnDelete, (x) => SelectedEntity != null);
             DialogOKCommand = new RelayCommand(() => OnDialogOKPressed(DialogOpenMode, EditEntity));
             DialogCancelCommand = new RelayCommand(() => OnDialogCancelPressed(DialogOpenMode, EditEntity));
 
@@ -80,7 +80,7 @@ namespace Tango.MachineStudio.DB.ViewModels.DBViewModels
         public T SelectedEntity
         {
             get { return _selectedEntity; }
-            set { _selectedEntity = value; RaisePropertyChangedAuto(); }
+            set { _selectedEntity = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
         private String _filter;
@@ -166,6 +166,7 @@ namespace Tango.MachineStudio.DB.ViewModels.DBViewModels
             entity.Save();
             IsDialogOpen = false;
             SelectedEntity = EditEntity;
+            SelectedEntity = null;
         }
 
         /// <summary>