diff --git a/source/childwin.pas b/source/childwin.pas
index 2e7a8296..5ab37afb 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -1266,6 +1266,7 @@ end;
 procedure TMDIChild.ShowDatabase(db: String);
 begin
   if (not DBTree.Dragging) and (
+   (PageControlMain.ActivePage = tabHost) or
    (PageControlMain.ActivePage = tabTable) or
    (PageControlMain.ActivePage = tabData)
   ) then PageControlMain.ActivePage := tabDatabase;