diff --git a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
index 250f752..82b864f 100644
--- a/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
+++ b/src/SharpIDE.Godot/Features/SlnPicker/SlnPicker.cs
@@ -2,6 +2,7 @@ using Godot;
 
 namespace SharpIDE.Godot.Features.SlnPicker;
 
+// This is a bit of a mess intertwined with the optional popup window
 public partial class SlnPicker : Control
 {
     private FileDialog _fileDialog = null!;
@@ -17,16 +18,10 @@ public partial class SlnPicker : Control
         var windowParent = GetParentOrNull<Window>();
         _fileDialog.FileSelected += path =>
         {
-            _tcs.SetResult(path);
             windowParent?.Hide();
+            _tcs.SetResult(path);
         };
-        _fileDialog.Canceled += () => _tcs.SetResult(null);
-        windowParent?.CloseRequested += OnCloseRequested;
-    }
-
-    private void OnCloseRequested()
-    {
-        _tcs.SetResult(null);
+        windowParent?.CloseRequested += () => _tcs.SetResult(null);
     }
 
     public async Task<string?> GetSelectedSolutionPath()
diff --git a/src/SharpIDE.Godot/IdeWindow.cs b/src/SharpIDE.Godot/IdeWindow.cs
index 0ba45d3..c4508ef 100644
--- a/src/SharpIDE.Godot/IdeWindow.cs
+++ b/src/SharpIDE.Godot/IdeWindow.cs
@@ -36,14 +36,15 @@ public partial class IdeWindow : Control
         }
         else
         {
-            var window = GetNode<Window>("Window");
-            window.Title = "Open Solution";
-            window.AddChild(_slnPicker);
-            window.Popup();
-            window.CloseRequested += () =>
+            var popupWindow = GetNode<Window>("Window");
+            var windowSize = GetWindow().GetSize();
+            popupWindow.Size = windowSize with { X = windowSize.X / 2, Y = windowSize.Y / 2 };
+            popupWindow.Title = "Open Solution";
+            popupWindow.AddChild(_slnPicker);
+            popupWindow.Popup();
+            popupWindow.CloseRequested += () =>
             {
-                window.Hide();
-                //window.QueueFreeChildren();
+                popupWindow.Hide();
             };
         }
         _ = Task.GodotRun(async () =>