diff --git a/Source/LibationAvalonia/Walkthrough.cs b/Source/LibationAvalonia/Walkthrough.cs
index eea88994..b7bd49d1 100644
--- a/Source/LibationAvalonia/Walkthrough.cs
+++ b/Source/LibationAvalonia/Walkthrough.cs
@@ -30,9 +30,10 @@ namespace LibationAvalonia
 		private static readonly IBrush FlashColor = Brushes.DodgerBlue;
 		private readonly MainWindow MainForm;
 		private readonly AsyncStepSequence sequence = new();
+		private readonly bool AutoScan;
 		public Walkthrough(MainWindow mainForm)
 		{
-			var autoscan = Configuration.Instance.AutoScan;
+			AutoScan = Configuration.Instance.AutoScan;
 			Configuration.Instance.AutoScan = false;
 			MainForm = mainForm;
 			sequence[nameof(ShowAccountDialog)] = () => UIThread.InvokeAsync(ShowAccountDialog);
@@ -41,10 +42,13 @@ namespace LibationAvalonia
 			sequence[nameof(ShowSearching)] = () => UIThread.InvokeAsync(ShowSearching);
 			sequence[nameof(ShowQuickFilters)] = () => UIThread.InvokeAsync(ShowQuickFilters);
 			sequence[nameof(ShowTourComplete)] = () => UIThread.InvokeAsync(ShowTourComplete);
-			Configuration.Instance.AutoScan = autoscan;
 		}
 
-		public async Task RunAsync() => await sequence.RunAsync();
+		public async Task RunAsync()
+		{
+			await sequence.RunAsync();
+			Configuration.Instance.AutoScan = AutoScan;
+		}
 
 		private async Task<bool> ShowAccountDialog()
 		{
diff --git a/Source/LibationWinForms/Walkthrough.cs b/Source/LibationWinForms/Walkthrough.cs
index 6c34ab24..79343bd9 100644
--- a/Source/LibationWinForms/Walkthrough.cs
+++ b/Source/LibationWinForms/Walkthrough.cs
@@ -25,9 +25,10 @@ namespace LibationWinForms
 		private static readonly Color FlashColor = Color.DodgerBlue;
 		private readonly Form1 MainForm;
 		private readonly AsyncStepSequence sequence = new();
+		private readonly bool AutoScan;
 		public Walkthrough(Form1 form1)
 		{
-			var autoscan = Configuration.Instance.AutoScan;
+			AutoScan = Configuration.Instance.AutoScan;
 			Configuration.Instance.AutoScan = false;
 			MainForm = form1;
 			sequence[nameof(ShowAccountDialog)] = ShowAccountDialog;
@@ -36,10 +37,13 @@ namespace LibationWinForms
 			sequence[nameof(ShowSearching)] = ShowSearching;
 			sequence[nameof(ShowQuickFilters)] = ShowQuickFilters;
 			sequence[nameof(ShowTourComplete)] = ShowTourComplete;
-			Configuration.Instance.AutoScan = autoscan;
 		}
 
-		public async Task RunAsync() => await sequence.RunAsync();
+		public async Task RunAsync()
+		{
+			await sequence.RunAsync();
+			Configuration.Instance.AutoScan = AutoScan;
+		}
 
 		private async Task<bool> ShowAccountDialog()
 		{