diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
index ad07b2a..06f8230 100644
--- a/MainWindow.axaml.cs
+++ b/MainWindow.axaml.cs
@@ -38,6 +38,11 @@ public partial class MainWindow : Window
         Logger.Log("Loading settings...");
         Global.Load();
         Settings.Load();
+        
+        
+        if (!string.IsNullOrWhiteSpace(Global._instance.config_path))
+            TbConfigPath.Text = PathUtilities.NormalizeFileSystemPath(Global._instance.config_path);
+        
         LoadPdfExportOptions();
         HookPdfExportOptionEvents();
 
@@ -132,6 +137,8 @@ public partial class MainWindow : Window
 
     private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
     {
+        Settings.Save();
+        Global.Save();
         Environment.Exit(0);
     }
 
@@ -451,6 +458,7 @@ public partial class MainWindow : Window
         TbSettingsCustomerDescription.Text = "";
         TbSettingsCustomerName.Text = "";
         TbSettingsCustomerPatchInfo.Text = "";
+        TbSettingsCustomerName.Focus();
 
         Settings.Save();
         RefreshCustomerItems();