diff --git a/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs
index feb5865..b7b594d 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs
+++ b/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs
@@ -185,7 +185,7 @@ public static void DetectAndSetPreferredJavaSdkPathToLatest (Action<TraceLevel,
 
 			logger          = logger ?? DefaultConsoleLogger;
 
-			var latestJdk   = MicrosoftOpenJdkLocations.GetMicrosoftOpenJdks (logger).FirstOrDefault ();
+			var latestJdk   = JdkInfo.GetPreferredJdkInfos (logger).FirstOrDefault ();
 			if (latestJdk == null)
 				throw new NotSupportedException ("No Microsoft OpenJDK could be found.  Please re-run the Visual Studio installer or manually specify the JDK path in settings.");
 
diff --git a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
index f7a0f0a..00a0f9f 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
+++ b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
@@ -280,6 +280,7 @@ static Dictionary<string, List<string>> GetJavaProperties (string java)
 			return props;
 		}
 
+		// Keep ordering in sync w/ GetPreferredJdkInfos
 		public static IEnumerable<JdkInfo> GetKnownSystemJdkInfos (Action<TraceLevel, string>? logger = null)
 		{
 			logger  = logger ?? AndroidSdkInfo.DefaultConsoleLogger;
@@ -300,6 +301,14 @@ public static IEnumerable<JdkInfo> GetKnownSystemJdkInfos (Action<TraceLevel, st
 				;
 		}
 
+		// Keep ordering in sync w/ GetKnownSystemJdkInfos
+		internal static IEnumerable<JdkInfo> GetPreferredJdkInfos (Action<TraceLevel, string> logger)
+		{
+			return MicrosoftOpenJdkLocations.GetMicrosoftOpenJdks (logger)
+				.Concat (MicrosoftDistJdkLocations.GetMicrosoftDistJdks (logger))
+				;
+		}
+
 		internal static JdkInfo? TryGetJdkInfo (string path, Action<TraceLevel, string> logger, string locator)
 		{
 			JdkInfo? jdk = null;