diff --git a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs
index 19b25794..cad52f11 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs
@@ -89,7 +89,10 @@ namespace mRemoteNG.UI.Forms.OptionsPages
              * Properties.OptionsTabsPanelsPage.Default.AlwaysShowConnectionTabs nerver used
              */
             //Properties.OptionsTabsPanelsPage.Default.AlwaysShowConnectionTabs = chkAlwaysShowConnectionTabs.Checked;
-            FrmMain.Default.ShowHidePanelTabs();
+            
+            // Defer the ShowHidePanelTabs call to avoid corrupting the Options window
+            // This ensures the call happens after the Options window is closed
+            FrmMain.Default.BeginInvoke(new System.Windows.Forms.MethodInvoker(FrmMain.Default.ShowHidePanelTabs));
 
             /* 
              * Comment added: June 16, 2024