diff --git a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
index defadc87..3bd65b81 100644
--- a/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
+++ b/Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
@@ -343,6 +343,7 @@
 								<Button
 									Grid.Row="6"
 									Grid.Column="0"
+									IsEnabled="False"
 									Content="{Binding DownloadDecryptSettings.EditCharReplacementText}"
 									Height="30"
 									Padding="30,3,30,3"
diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj
index 50090c9e..4d74e348 100644
--- a/Source/LibationAvalonia/LibationAvalonia.csproj
+++ b/Source/LibationAvalonia/LibationAvalonia.csproj
@@ -71,6 +71,8 @@
     <None Remove="Assets\SEGOEUI.TTF" />
     <None Remove="Assets\up.png" />
     <None Remove="Assets\WINGDING.TTF" />
+    <None Remove="MessageBox.cs~RF105afb8d.TMP" />
+    <None Remove="Views\MainWindow\MainWindow.Export.axaml.cs~RF10732d95.TMP" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.Export.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Export.axaml.cs
index 18aabeab..0c2e925a 100644
--- a/Source/LibationAvalonia/Views/MainWindow/MainWindow.Export.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Export.axaml.cs
@@ -10,7 +10,7 @@ namespace LibationAvalonia.Views
 	{
 		private void Configure_Export() { }
 
-		public void exportLibraryToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
+		public async void exportLibraryToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
 		{
 			try
 			{
@@ -22,26 +22,26 @@ namespace LibationAvalonia.Views
 				saveFileDialog.Filters.Add(new FileDialogFilter { Name = "CSV files (*.csv)", Extensions = new() { "csv" } });
 				saveFileDialog.Filters.Add(new FileDialogFilter { Name = "JSON files (*.json)", Extensions = new() { "json" } });
 				saveFileDialog.Filters.Add(new FileDialogFilter { Name = "All files (*.*)", Extensions = new() { "*" } });
-			
 
-				// FilterIndex is 1-based, NOT 0-based
-				/*
-				switch (saveFileDialog.FilterIndex)
+				var fileName = await saveFileDialog.ShowAsync(this);
+				if (fileName is null) return;
+
+				var ext = System.IO.Path.GetExtension(fileName);
+				switch (ext)
 				{
-					case 1: // xlsx
+					case "xlsx": // xlsx
 					default:
-						LibraryExporter.ToXlsx(saveFileDialog.FileName);
+						LibraryExporter.ToXlsx(fileName);
 						break;
-					case 2: // csv
-						LibraryExporter.ToCsv(saveFileDialog.FileName);
+					case "csv": // csv
+						LibraryExporter.ToCsv(fileName);
 						break;
-					case 3: // json
-						LibraryExporter.ToJson(saveFileDialog.FileName);
+					case "json": // json
+						LibraryExporter.ToJson(fileName);
 						break;
 				}
 
-				MessageBox.Show("Library exported to:\r\n" + saveFileDialog.FileName);
-				*/
+				MessageBox.Show("Library exported to:\r\n" + fileName, "Library Exported");
 			}
 			catch (Exception ex)
 			{
diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs
index b01c9e5d..f8f0d155 100644
--- a/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs
@@ -67,9 +67,11 @@ namespace LibationAvalonia.Views
 
 		private async void MainWindow_Opened(object sender, EventArgs e)
 		{
+			/*
 			var charReplace = new EditReplacementChars();
 
 			await charReplace.ShowDialog(this);
+			*/
 		}
 
 		public void ProductsDisplay_Initialized1(object sender, EventArgs e)