diff --git a/source/main.pas b/source/main.pas
index 28b13f66..417a55b6 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -1204,6 +1204,12 @@ begin
   FreeAndNil(CreateTableForm);
   FreeAndNil(RoutineEditForm);
   FreeAndNil(MaintenanceForm);
+  FreeAndNil(UserManagerForm);
+  FreeAndNil(ViewForm);
+  FreeAndNil(SelectDBObjectForm);
+  FreeAndNil(SQLHelpForm);
+  FreeAndNil(CreateDatabaseForm);
+  FreeAndNil(TablePropertiesForm);
 
   debug('mem: clearing query and browse data.');
   SetLength(FDataGridResult.Rows, 0);