diff --git a/LiamWorkflowDiagnostics/MainWindow.xaml.cs b/LiamWorkflowDiagnostics/MainWindow.xaml.cs
index 8021643..409cd55 100644
--- a/LiamWorkflowDiagnostics/MainWindow.xaml.cs
+++ b/LiamWorkflowDiagnostics/MainWindow.xaml.cs
@@ -32,6 +32,7 @@ namespace LiamWorkflowDiagnostics
 
         private readonly ObservableCollection<string> _logEntries = new ObservableCollection<string>();
         private ProviderTestSession _session;
+        private bool _isInitializingUi;
         private readonly string _settingsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "LiamWorkflowDiagnostics.settings.json");
 
         public MainWindow()
@@ -39,11 +40,19 @@ namespace LiamWorkflowDiagnostics
             InitializeComponent();
             LogListBox.ItemsSource = _logEntries;
             InitializeLogging();
-            InitializeCombos();
-            MaxDepthTextBox.Text = "1";
-            LoadSettings();
-            UpdateProviderActionPanel();
-            ToggleActionButtons(true);
+            _isInitializingUi = true;
+            try
+            {
+                InitializeCombos();
+                MaxDepthTextBox.Text = "1";
+                LoadSettings();
+                UpdateProviderActionPanel();
+                ToggleActionButtons(true);
+            }
+            finally
+            {
+                _isInitializingUi = false;
+            }
             this.Closing += MainWindow_Closing;
             AppendLog("Diagnostics tool bereit.");
         }
@@ -206,6 +215,8 @@ namespace LiamWorkflowDiagnostics
 
             UpdateProviderActionPanel();
             ToggleActionButtons(true);
+            if (_isInitializingUi)
+                return;
             SaveSettings();
         }