diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/JavadocInfo.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/JavadocInfo.cs
index 99ab9ac5d..1bfc1a5b2 100644
--- a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/JavadocInfo.cs
+++ b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/JavadocInfo.cs
@@ -257,9 +257,10 @@ static XElement CreateAndroidDocLinkUri (string prefix, string declaringJniType,
 			// Example: "https://developer.android.com/reference/android/app/Application#registerOnProvideAssistDataListener(android.app.Application.OnProvideAssistDataListener)"
 			// Example: "https://developer.android.com/reference/android/animation/ObjectAnimator#ofFloat(T,%20android.util.Property%3CT,%20java.lang.Float%3E,%20float...)"
 
+			declaringJniType = declaringJniType.Replace ("$", ".");
 			var java    = new StringBuilder (declaringJniType)
-				.Replace ("/", ".")
-				.Replace ("$", ".");
+				.Replace ("/", ".");
+
 			var url     = new StringBuilder (prefix);
 			if (!prefix.EndsWith ("/", StringComparison.Ordinal)) {
 				url.Append ("/");
diff --git a/tools/generator/Java.Interop.Tools.Generator.Transformation/JavadocFixups.cs b/tools/generator/Java.Interop.Tools.Generator.Transformation/JavadocFixups.cs
index 09e1c3c7d..c9eca4a24 100644
--- a/tools/generator/Java.Interop.Tools.Generator.Transformation/JavadocFixups.cs
+++ b/tools/generator/Java.Interop.Tools.Generator.Transformation/JavadocFixups.cs
@@ -46,6 +46,9 @@ public static void Fixup (List<GenBase> gens, CodeGeneratorOptions options)
 
 			foreach (var type in gens) {
 				AddJavadoc (type, typeJavadocs, options.XmldocStyle);
+				foreach (var nested in type.NestedTypes) {
+					AddJavadoc (nested, typeJavadocs, options.XmldocStyle);
+				}
 			}
 		}