diff --git a/src/MauiSherpa.Core/Services/DoctorService.cs b/src/MauiSherpa.Core/Services/DoctorService.cs
index bbce2691..0f042cbb 100644
--- a/src/MauiSherpa.Core/Services/DoctorService.cs
+++ b/src/MauiSherpa.Core/Services/DoctorService.cs
@@ -794,7 +794,7 @@ private async Task CheckJdkAsync(VersionDependency jdkDep, List<DependencyStatus
         var status = installedVersion != null ? DependencyStatusType.Ok : DependencyStatusType.Error;
         var message = installedVersion != null 
             ? $"JDK {installedVersion} found"
-            : "JDK not found. Required for Android development.";
+            : "JDK not found. Download and run the Microsoft OpenJDK installer, then run Doctor again.";
         
         dependencies.Add(new DependencyStatus(
             "JDK",
diff --git a/src/MauiSherpa/Components/BackgroundTaskCenter.razor b/src/MauiSherpa/Components/BackgroundTaskCenter.razor
index 052cd6ea..88949e6f 100644
--- a/src/MauiSherpa/Components/BackgroundTaskCenter.razor
+++ b/src/MauiSherpa/Components/BackgroundTaskCenter.razor
@@ -441,6 +441,11 @@
         catch (JSDisconnectedException)
         {
         }
+        catch (JSException ex) when (ex.Message.Contains(
+            "does not exist (has it been disposed?)",
+            StringComparison.Ordinal))
+        {
+        }
 
         _dotNetReference?.Dispose();
     }
diff --git a/src/MauiSherpa/Components/SecretProviderPicker.razor b/src/MauiSherpa/Components/SecretProviderPicker.razor
index 9936ad07..3c5f54e4 100644
--- a/src/MauiSherpa/Components/SecretProviderPicker.razor
+++ b/src/MauiSherpa/Components/SecretProviderPicker.razor
@@ -432,6 +432,11 @@
         catch (JSDisconnectedException)
         {
         }
+        catch (JSException ex) when (ex.Message.Contains(
+            "does not exist (has it been disposed?)",
+            StringComparison.Ordinal))
+        {
+        }
 
         _dotNetReference?.Dispose();
     }
diff --git a/src/MauiSherpa/Pages/Doctor.razor b/src/MauiSherpa/Pages/Doctor.razor
index e9eb788a..f2e8b4a3 100644
--- a/src/MauiSherpa/Pages/Doctor.razor
+++ b/src/MauiSherpa/Pages/Doctor.razor
@@ -375,10 +375,19 @@
                                         <span class="dep-message">@dep.Message</span>
                                     }
                                 </div>
-                                @if (dep.IsFixable)
+                                @if (IsMissingJdk(dep))
+                                {
+                                    <button class="btn btn-sm btn-fix"
+                                            @onclick="DownloadMicrosoftOpenJdk"
+                                            disabled="@isLoading">
+                                        <i class="fas fa-download"></i>
+                                        Download Microsoft OpenJDK
+                                    </button>
+                                }
+                                else if (dep.IsFixable)
                                 {
                                     <button class="btn btn-sm btn-fix" @onclick="@(() => FixDependency(dep))" disabled="@isLoading">
-                                        Fix
+                                        @GetDependencyActionLabel(dep)
                                     </button>
                                 }
                             </div>
@@ -1182,6 +1191,18 @@ else
         _ => "status-unknown"
     };
 
+    private static bool IsMissingJdk(DependencyStatus dependency) =>
+        dependency.Category == DependencyCategory.Jdk &&
+        dependency.Status == DependencyStatusType.Error;
+
+    private static string GetDependencyActionLabel(DependencyStatus dependency) =>
+        dependency.FixAction == "install-android-sdk"
+            ? "Install Android SDK"
+            : "Fix";
+
+    private Task DownloadMicrosoftOpenJdk() =>
+        OpenUrl("https://learn.microsoft.com/java/openjdk/download");
+
     private string GetCategoryName(DependencyCategory category) => category switch
     {
         DependencyCategory.DotNetSdk => ".NET SDK",