diff --git a/source/childwin.pas b/source/childwin.pas
index b79a2dac..d8cc895c 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -1282,9 +1282,9 @@ begin
   tabData.TabVisible := false;
 
   pnlTableTop.Caption := 'Table-Properties';
-  Caption := Description + ' - /' + ActualDatabase;
   ActualDatabase := db;
   EnsureActiveDatabase;
+  Caption := Description + ' - /' + ActualDatabase;
   ActualTable := '';
   try
     ShowDBProperties( Self );