diff --git a/source/table_editor.pas b/source/table_editor.pas
index d0ffd804..aa4ed3b7 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -1399,6 +1399,8 @@ begin
   // Column data gets freed below - end any editor which could cause AV's
   if treeIndexes.IsEditing then
     treeIndexes.CancelEditNode;
+  // Trigger ValidateIndexControls
+  treeIndexes.FocusedNode := nil;
   for i:=0 to FKeys.Count-1 do begin
     TblKey := TTableKey(FKeys[i]);
     if not TblKey.Added then