diff --git a/src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs b/src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs
index f435e32..113577b 100644
--- a/src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs
+++ b/src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs
@@ -35,9 +35,10 @@ public static class RoslynAnalysis
 	private static SharpIdeSolutionModel? _sharpIdeSolutionModel;
 	private static HashSet<CodeFixProvider> _codeFixProviders = [];
 	private static HashSet<CodeRefactoringProvider> _codeRefactoringProviders = [];
-	private static TaskCompletionSource _solutionLoadedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+	private static TaskCompletionSource _solutionLoadedTcs = null!;
 	public static void StartSolutionAnalysis(SharpIdeSolutionModel solutionModel)
 	{
+		_solutionLoadedTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
 		_ = Task.Run(async () =>
 		{
 			try
diff --git a/src/SharpIDE.Godot/IdeWindow.cs b/src/SharpIDE.Godot/IdeWindow.cs
index c4508ef..f0b16b2 100644
--- a/src/SharpIDE.Godot/IdeWindow.cs
+++ b/src/SharpIDE.Godot/IdeWindow.cs
@@ -72,6 +72,10 @@ public partial class IdeWindow : Control
                     RemoveChild(_ideRoot);
                     _ideRoot.QueueFree();
                 }
+                else
+                { 
+                    GetWindow().Mode = Window.ModeEnum.Maximized;
+                }
                 _ideRoot = ideRoot;
                 AddChild(ideRoot);
             });
diff --git a/src/SharpIDE.Godot/IdeWindow.tscn b/src/SharpIDE.Godot/IdeWindow.tscn
index fa62fc5..84833c6 100644
--- a/src/SharpIDE.Godot/IdeWindow.tscn
+++ b/src/SharpIDE.Godot/IdeWindow.tscn
@@ -16,5 +16,4 @@ oversampling_override = 1.0
 title = "Open Solution"
 initial_position = 2
 visible = false
-wrap_controls = true
 popup_window = true