diff --git a/src/ce_main.pas b/src/ce_main.pas
index 5def2aae..71ce3ef7 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -513,6 +513,9 @@ procedure TCEMainForm.SaveDocking;
 var
   xcfg: TXMLConfigStorage;
 begin
+  WindowState := wsNormal;
+  if not Visible then exit;
+  //
   xcfg := TXMLConfigStorage.Create(getDocPath + 'docking.xml',false);
   try
     DockMaster.SaveLayoutToConfig(xcfg);