diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
index 14694bc24ce..dcc0616c828 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs
@@ -141,12 +141,31 @@ public void CheckElementReOrdering ([Values (true, false)] bool useAapt2)
 				var manifestFile = Path.Combine (Root, builder.ProjectDirectory, proj.IntermediateOutputPath, "android", "AndroidManifest.xml");
 				XDocument doc = XDocument.Load (manifestFile);
 				var ns = doc.Root.GetNamespaceOfPrefix ("android");
-				var manifest = doc.Element ("manifest");
-				Assert.IsNotNull (manifest, "manifest element should not be null.");
-				var app = manifest.Element ("application");
-				Assert.IsNotNull (app, "application element should not be null.");
+				var manifest = GetElement (doc, "manifest");
+				var app = GetElement (manifest, "application");
 				Assert.AreEqual (0, app.ElementsAfterSelf ().Count (),
 					"There should be no elements after the application element");
+				var activity = GetElement (app, "activity");
+				AssertAttribute (activity, ns + "exported", "true");
+				var intent_filter = GetElement (activity, "intent-filter");
+				var action = GetElement (intent_filter, "action");
+				AssertAttribute (action, ns + "name", "android.intent.action.MAIN");
+				var category = GetElement (intent_filter, "category");
+				AssertAttribute (category, ns + "name", "android.intent.category.LAUNCHER");
+			}
+
+			static XElement GetElement (XContainer parent, XName name)
+			{
+				var e = parent.Element (name);
+				Assert.IsNotNull (e, $"{name} element should not be null.");
+				return e;
+			}
+
+			static void AssertAttribute (XElement parent, XName name, string expected)
+			{
+				var a = parent.Attribute (name);
+				Assert.IsNotNull (a, $"{name} attribute should not be null.");
+				Assert.AreEqual (expected, a.Value, $"{name} attribute value did not match.");
 			}
 		}
 
diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs b/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
index 8e41182cb90..b1b07d80df9 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/ManifestDocument.cs
@@ -798,6 +798,7 @@ void AddLauncherIntentElements (XElement activity)
 				return;
 
 			var filter = new XElement ("intent-filter");
+			activity.Add (new XAttribute (androidNs + "exported", "true"));
 			activity.AddFirst (filter);
 			foreach (KeyValuePair<string, string> e in LauncherIntentElements) {
 				if (!filter.Elements (e.Key).Any (x => ((string) x.Attribute (attName)) == e.Value))