diff --git a/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs b/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs
index 3ae27ebf2..60c4b8fa4 100644
--- a/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs
+++ b/src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs
@@ -30,7 +30,7 @@ public static void Fixup (IList<ClassFile> classes)
 					var class_metadata = (metadata as KotlinClass);
 
 					if (class_metadata != null) {
-						FixupClassVisibility (c, class_metadata);
+						FixupClassVisibility (c, class_metadata, classes);
 
 						if (!c.AccessFlags.IsPubliclyVisible ())
 							continue;
@@ -62,7 +62,7 @@ public static void Fixup (IList<ClassFile> classes)
 			}
 		}
 
-		static void FixupClassVisibility (ClassFile klass, KotlinClass metadata)
+		static void FixupClassVisibility (ClassFile klass, KotlinClass metadata, IList<ClassFile> classes)
 		{
 			// Hide class if it isn't Public/Protected
 			if (klass.AccessFlags.IsPubliclyVisible () && !metadata.Visibility.IsPubliclyVisible ()) {
@@ -83,15 +83,33 @@ static void FixupClassVisibility (ClassFile klass, KotlinClass metadata)
 				Log.Debug ($"Kotlin: Hiding internal class {klass.ThisClass.Name.Value}");
 				klass.AccessFlags = SetVisibility (klass.AccessFlags, ClassAccessFlags.Private);
 
-				foreach (var ic in klass.InnerClasses) {
-					Log.Debug ($"Kotlin: Hiding nested internal type {ic.InnerClass.Name.Value}");
-					ic.InnerClassAccessFlags = SetVisibility (ic.InnerClassAccessFlags, ClassAccessFlags.Private);
-				}
+				foreach (var ic in klass.InnerClasses)
+					HideInternalInnerClass (ic, classes);
 
 				return;
 			}
 		}
 
+		static void HideInternalInnerClass (InnerClassInfo klass, IList<ClassFile> classes)
+		{
+			var existing = klass.InnerClassAccessFlags;
+
+			klass.InnerClassAccessFlags = SetVisibility (existing, ClassAccessFlags.Private);
+			Log.Debug ($"Kotlin: Hiding nested internal type {klass.InnerClass.Name.Value}");
+
+			// Setting the inner class access flags above doesn't technically do anything, because we output
+			// from the inner class's ClassFile, so we need to find that and set it there.
+			var kf = classes.FirstOrDefault (c => c.ThisClass.Name.Value == klass.InnerClass.Name.Value);
+
+			if (kf != null) {
+				kf.AccessFlags = SetVisibility (kf.AccessFlags, ClassAccessFlags.Private);
+				kf.InnerClass.InnerClassAccessFlags = SetVisibility (kf.InnerClass.InnerClassAccessFlags, ClassAccessFlags.Private);
+
+				foreach (var inner_class in kf.InnerClasses.Where (c => c.OuterClass.Name.Value == kf.ThisClass.Name.Value))
+					HideInternalInnerClass (inner_class, classes);
+			}
+		}
+
 		// Passing null for 'newVisibility' parameter means 'package-private'
 		static ClassAccessFlags SetVisibility (ClassAccessFlags existing, ClassAccessFlags? newVisibility)
 		{
diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs b/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs
index 39841abe2..d8d7396dd 100644
--- a/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs
+++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs
@@ -310,5 +310,24 @@ public void HandleKotlinNameShadowing ()
 			Assert.True (klass.Methods.Single (m => m.Name == "hitCount").AccessFlags.HasFlag (MethodAccessFlags.Public));
 			Assert.True (klass.Methods.Single (m => m.Name == "setType").AccessFlags.HasFlag (MethodAccessFlags.Public));
 		}
+
+		[Test]
+		public void HidePublicInterfaceInInternalClass ()
+		{
+			var klass = LoadClassFile ("InternalClassWithNestedInterface.class");
+			var inner_interface = LoadClassFile ("InternalClassWithNestedInterface$NestedInterface.class");
+			var inner_inner_interface = LoadClassFile ("InternalClassWithNestedInterface$NestedInterface$DoubleNestedInterface.class");
+
+			KotlinFixups.Fixup (new [] { klass, inner_interface, inner_inner_interface });
+
+			var output = new XmlClassDeclarationBuilder (klass).ToXElement ().ToString ();
+			Assert.True (output.Contains ("visibility=\"public\""));
+
+			var output2 = new XmlClassDeclarationBuilder (inner_interface).ToXElement ().ToString ();
+			Assert.True (output2.Contains ("visibility=\"private\""));
+
+			var output3 = new XmlClassDeclarationBuilder (inner_inner_interface).ToXElement ().ToString ();
+			Assert.True (output3.Contains ("visibility=\"private\""));
+		}
 	}
 }
diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface$DoubleNestedInterface.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface$DoubleNestedInterface.class
new file mode 100644
index 000000000..e27a40add
Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface$DoubleNestedInterface.class differ
diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface.class
new file mode 100644
index 000000000..ad2e8205b
Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface$NestedInterface.class differ
diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.class b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.class
new file mode 100644
index 000000000..acfd9bfce
Binary files /dev/null and b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.class differ
diff --git a/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.kt b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.kt
new file mode 100644
index 000000000..a2af30e09
--- /dev/null
+++ b/tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClassWithNestedInterface.kt
@@ -0,0 +1,5 @@
+internal class InternalClassWithNestedInterface {
+public interface NestedInterface {
+public interface DoubleNestedInterface
+}
+}
\ No newline at end of file