diff --git a/src/SharpIDE.Photino/Components/SolutionPickerDialog.razor b/src/SharpIDE.Photino/Components/SolutionPickerDialog.razor
index dd08068..eabbd9d 100644
--- a/src/SharpIDE.Photino/Components/SolutionPickerDialog.razor
+++ b/src/SharpIDE.Photino/Components/SolutionPickerDialog.razor
@@ -24,6 +24,17 @@
 		_solutionFilePath = AppState.SolutionFilePath;
 	}
 
+	protected override void OnAfterRender(bool firstRender)
+	{
+		if (firstRender)
+		{
+			if (AppState.IdeSettings.AutoOpenLastSolution && !string.IsNullOrWhiteSpace(_solutionFilePath))
+			{
+				MudDialog.Close(_solutionFilePath);
+			}
+		}
+	}
+
 	private async Task PickSolution()
 	{
 		var files = await PhotinoBlazorApp.MainWindow.ShowOpenFileAsync("Choose Solution File", filters: [("Solution File", [".sln", ".slnx"])]);