diff --git a/src/SamplesApp/SamplesApp.Shared/App.xaml.cs b/src/SamplesApp/SamplesApp.Shared/App.xaml.cs
index ca9bc46e35e1..11225dda467b 100644
--- a/src/SamplesApp/SamplesApp.Shared/App.xaml.cs
+++ b/src/SamplesApp/SamplesApp.Shared/App.xaml.cs
@@ -225,6 +225,7 @@ void ConfigureFilters(ILoggerFactory factory)
 
 						// Generic Xaml events
 						// { "Windows.UI.Xaml", LogLevel.Debug },
+						// { "Windows.UI.Xaml.Media", LogLevel.Debug },
 						// { "Windows.UI.Xaml.Shapes", LogLevel.Debug },
 						// { "Windows.UI.Xaml.VisualStateGroup", LogLevel.Debug },
 						// { "Windows.UI.Xaml.StateTriggerBase", LogLevel.Debug },
diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewModel.cs b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewModel.cs
index 8f67b7e28916..83172b05ce65 100644
--- a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewModel.cs
+++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UITests/Presentation/SampleChooserViewModel.cs
@@ -543,7 +543,7 @@ from type in FindDefinedAssemblies(assembly)
 				let content = GetContent(type, sampleAttribute)
 				from category in content.Categories
 				group content by category into contentByCategory
-				orderby contentByCategory.Key
+				orderby contentByCategory.Key.ToLower(CultureInfo.CurrentUICulture)
 				select new SampleChooserCategory(contentByCategory);
 
 			return categories.AsParallel().ToList();