diff --git a/.gitignore b/.gitignore
index feaa20e3..656cf6de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -716,4 +716,6 @@ http-client.private.env.json
 # Github Copilot persisted session migrations, see: https://github.com/microsoft/copilot-intellij-feedback/issues/712#issuecomment-3322062215
 .idea/**/copilot.data.migration.*.xml
 
-######## END JET BRAINS git ignore https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
\ No newline at end of file
+######## END JET BRAINS git ignore https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+/AgentFiles/*
+/.claude/*
diff --git a/src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindow.cs b/src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindow.cs
index cc3458c5..52466129 100644
--- a/src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindow.cs
+++ b/src/LogExpert.UI/Dialogs/LogTabWindow/LogTabWindow.cs
@@ -829,7 +829,10 @@ private void AddLogWindow (LogWindow.LogWindow logWindow, string title, bool doN
 
         _tabController.AddWindow(logWindow, title, doNotAddToPanel);
 
-        logWindow.Visible = true;
+        if (!doNotAddToPanel)
+        {
+            logWindow.Visible = true;
+        }
     }
 
     private void ConnectEventHandlers (LogWindow.LogWindow logWindow)
@@ -1643,7 +1646,23 @@ private void RestoreLayout (string layoutXml)
 
         _ = memStream.Seek(0, SeekOrigin.Begin);
 
-        dockPanel.LoadFromXml(memStream, DeserializeDockContent, true);
+        try
+        {
+            dockPanel.LoadFromXml(memStream, DeserializeDockContent, true);
+        }
+        catch (InvalidOperationException e)
+        {
+            _logger.Warn($"Layout restoration failed, showing windows with default layout: {e.Message}");
+            ShowDeferredWindows();
+        }
+    }
+
+    private void ShowDeferredWindows ()
+    {
+        foreach (var window in _tabController.GetAllWindows().Where(w => w.DockPanel == null))
+        {
+            window.Show(dockPanel);
+        }
     }
 
     [SupportedOSPlatform("windows")]
diff --git a/src/PluginRegistry/PluginHashGenerator.Generated.cs b/src/PluginRegistry/PluginHashGenerator.Generated.cs
index d99a7db9..57823e8f 100644
--- a/src/PluginRegistry/PluginHashGenerator.Generated.cs
+++ b/src/PluginRegistry/PluginHashGenerator.Generated.cs
@@ -10,7 +10,7 @@ public static partial class PluginValidator
 {
     /// <summary>
     /// Gets pre-calculated SHA256 hashes for built-in plugins.
-    /// Generated: 2026-06-08 14:41:04 UTC
+    /// Generated: 2026-06-08 18:22:43 UTC
     /// Configuration: Release
     /// Plugin count: 21
     /// </summary>
@@ -18,27 +18,27 @@ public static Dictionary<string, string> GetBuiltInPluginHashes()
     {
         return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
-                         ["AutoColumnizer.dll"] = "9204D09A3A292611A299164FE55457E074EF26BB8AC04B525C82D1F86878C70A",
+                         ["AutoColumnizer.dll"] = "FF45688846E19EDDF7244BD9D69254926E32DD5A79730018160696C9F9B5B735",
             ["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
             ["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
-            ["CsvColumnizer.dll"] = "09694D6F828AE036CECB983A004ABAB6A9B05539E670C642AD9F8440828F2942",
-            ["CsvColumnizer.dll (x86)"] = "09694D6F828AE036CECB983A004ABAB6A9B05539E670C642AD9F8440828F2942",
-            ["DefaultPlugins.dll"] = "4FCDA7C98D3184119BE57AB3E22B40889F48278C2504F29C35CF3E2497D306EC",
-            ["FlashIconHighlighter.dll"] = "6B2F76FD5943E4E328A1D042624E1766C92C5909C0BDC12D395582425D039A01",
-            ["GlassfishColumnizer.dll"] = "9AE2A91F3402B7FE138757495C05C61FCF1CB3D75D407881919A7296027C231F",
-            ["JsonColumnizer.dll"] = "55EB5FBAB7964B9295A49256D826AE3B803F77B8C44CC253F52F2F3393B8B38E",
-            ["JsonCompactColumnizer.dll"] = "AC66C875C48B5729660CAA2F60901AAD49DB81E90C19A8A43E808EE32789D7F7",
-            ["Log4jXmlColumnizer.dll"] = "B8C06431ED331CDBCD70678CA4C8976785B3828E16BC6EBF855DDBEB5AD36E49",
-            ["LogExpert.Resources.dll"] = "37B943E9A68108E3155CB885367E14D6B81E8721182F0BE880BFA161AF0DB668",
+            ["CsvColumnizer.dll"] = "3865D9280E673C03185B2B39053708DD6D782D97C5292AF4DD123AFA19531CD3",
+            ["CsvColumnizer.dll (x86)"] = "3865D9280E673C03185B2B39053708DD6D782D97C5292AF4DD123AFA19531CD3",
+            ["DefaultPlugins.dll"] = "36C050D6380D6F7B9403D43AACFA060F542D225E8C6B027B2E4F3CB18C5E298B",
+            ["FlashIconHighlighter.dll"] = "3A02E81476958DA1C411C8A2425A6482A55C05CADDFEAE60E7E4B282EA8CDBDF",
+            ["GlassfishColumnizer.dll"] = "135C0D23AB6A44376B01AB3FB19A2EADDDEBC6EDFDEDBA6682F30C57D988DC36",
+            ["JsonColumnizer.dll"] = "6270BE7D27EE4A5AB5AB1D9967ED97F3EC91B553C7D3A5968350933AB892F772",
+            ["JsonCompactColumnizer.dll"] = "8E5F12FE7BD86DDC9B3B0B1D3C04B49AD0394C81A9F899684A5F16532A5B0A35",
+            ["Log4jXmlColumnizer.dll"] = "3C4806DBD51DA3CECF152EB19C0A267DC0F8B977DF9457DAEEFA1F0A099525ED",
+            ["LogExpert.Resources.dll"] = "2D1743296A62E8BB1089635043A46A036AAD45E92E981C77ECA3373E3D9CCB5B",
             ["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
             ["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
             ["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
             ["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
-            ["RegexColumnizer.dll"] = "1014404A647FAF26CF19C9186E4BF5E1A17614A281B917C869DAB67C89B1BD66",
-            ["SftpFileSystem.dll"] = "ED6C05BA660754E4B466C129E52298A93309391B4E8944C0C5989F6820514EDF",
-            ["SftpFileSystem.dll (x86)"] = "F21802A8E877838D856E14D1D32535622623088FA59F6F141F43686531660D54",
-            ["SftpFileSystem.Resources.dll"] = "BD63A4CED4F31842A50BC28BC9DF4E813EFAD9305D64F8BF2546DC8C3A566413",
-            ["SftpFileSystem.Resources.dll (x86)"] = "BD63A4CED4F31842A50BC28BC9DF4E813EFAD9305D64F8BF2546DC8C3A566413",
+            ["RegexColumnizer.dll"] = "082BF04B54570B54F4BCF323338174F5818ED1A0992F56E6D7B367D36BAD2D57",
+            ["SftpFileSystem.dll"] = "5E8378F4FB45D51A635B471F743326F40199AB70FBDB8D2527F8D0A00C33AC78",
+            ["SftpFileSystem.dll (x86)"] = "9F2C46E0C878EE92BBA225A859872A7BE3E9F6584931DE45FC087192945D41F4",
+            ["SftpFileSystem.Resources.dll"] = "394C36CE8D4CFD7735E200FEF7ADC6C0F133AD94221B72AE7977600ABB25AA4B",
+            ["SftpFileSystem.Resources.dll (x86)"] = "394C36CE8D4CFD7735E200FEF7ADC6C0F133AD94221B72AE7977600ABB25AA4B",
 
         };
     }