diff --git a/source/main.pas b/source/main.pas
index 4f53655b..308a23a5 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -3237,6 +3237,7 @@ procedure TMainForm.ShowHost;
 begin
   if (not DBTree.Dragging) and (
    (PageControlMain.ActivePage = tabDatabase) or
+   (PageControlMain.ActivePage = tabEditor) or
    (PageControlMain.ActivePage = tabData)
   ) then PageControlMain.ActivePage := tabHost;