diff --git a/source/options.pas b/source/options.pas
index 69bfc9a9..55794003 100644
--- a/source/options.pas
+++ b/source/options.pas
@@ -489,8 +489,7 @@ begin
 
   // Shortcuts
   TreeShortcutItems.ReinitChildren(nil, True);
-  TreeShortcutItems.FocusedNode := nil;
-  TreeShortcutItems.OnFocusChanged(TreeShortcutItems, TreeShortcutItems.FocusedNode, NoColumn);
+  SelectNode(TreeShortcutItems, nil);
 
   btnApply.Enabled := False;
   screen.Cursor := crdefault;
diff --git a/source/routine_editor.pas b/source/routine_editor.pas
index 21674537..1101c848 100644
--- a/source/routine_editor.pas
+++ b/source/routine_editor.pas
@@ -144,7 +144,7 @@ begin
   for i:=0 to High(Obj.Connection.Datatypes) do
     comboReturns.Items.Add(Obj.Connection.Datatypes[i].Name);
   chkDeterministic.Checked := False;
-  listParameters.FocusedNode := nil;
+  SelectNode(listParameters, nil);
   listParameters.Clear;
   Parameters.Clear;
   comboDataAccess.ItemIndex := 0;
diff --git a/source/table_editor.pas b/source/table_editor.pas
index c53efb0d..ee093976 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -1424,7 +1424,7 @@ begin
   if treeIndexes.IsEditing then
     treeIndexes.CancelEditNode;
   // Trigger ValidateIndexControls
-  treeIndexes.FocusedNode := nil;
+  SelectNode(treeIndexes, nil);
   for i:=0 to FKeys.Count-1 do begin
     TblKey := TTableKey(FKeys[i]);
     if not TblKey.Added then