diff --git a/source/main.pas b/source/main.pas
index 682672ac..90d96cb7 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -1558,10 +1558,10 @@ begin
     comboOnlyDBs.ItemIndex := 0
   else
     comboOnlyDBs.Text := '';
-  // Forces Tree.ReInitChildren to refetch database names
-  FreeAndNil(AllDatabases);
   // All db nodes must get collapsed to avoid auto initialization of table caches (along with AVs)
   menuTreeCollapseAllClick(Self);
+  // Forces Tree.ReInitChildren to refetch database names
+  FreeAndNil(AllDatabases);
   RefreshTree(False);
 
   DBTree.Color := GetRegValue(REGNAME_TREEBACKGROUND, clWindow, SessionName);