diff --git a/src/SharpIDE.Godot/IdeWindow.cs b/src/SharpIDE.Godot/IdeWindow.cs
index e84fa52..2716f6f 100644
--- a/src/SharpIDE.Godot/IdeWindow.cs
+++ b/src/SharpIDE.Godot/IdeWindow.cs
@@ -26,7 +26,10 @@ public partial class IdeWindow : Control
         GD.Print("IdeWindow _Ready called");
         ResourceLoader.LoadThreadedRequest(SlnPickerScenePath);
         ResourceLoader.LoadThreadedRequest(IdeRootScenePath);
-        MSBuildLocator.RegisterDefaults();
+        // Use latest version - https://github.com/microsoft/MSBuildLocator/issues/81
+        var instance = MSBuildLocator.QueryVisualStudioInstances().MaxBy(s => s.Version);
+        if (instance is null) throw new InvalidOperationException("No MSBuild instances found");
+        MSBuildLocator.RegisterInstance(instance);
         GodotOtelExtensions.AddServiceDefaults();
         Singletons.AppState = AppStateLoader.LoadAppStateFromConfigFile();
         //GetWindow().SetMinSize(new Vector2I(1152, 648));