diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs
index c7bd36bca0..9295d2c2dd 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexNamespaceRegistry.cs
@@ -58,11 +58,11 @@ namespace Perspex.Markup.Xaml.Context
 
             if (!IsClrNamespace(name))
             {
+                ScanNewAssemblies();
                 result = _namespaces.FirstOrDefault(x => x.Name == name);
 
                 if (result == null)
                 {
-                    ScanNewAssemblies();
                     result = _namespaces.FirstOrDefault(x => x.Name == name);
                 }
             }
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/StyleTests.cs b/tests/Perspex.Markup.Xaml.UnitTests/StyleTests.cs
index 8fa212c17a..9c6a9715c1 100644
--- a/tests/Perspex.Markup.Xaml.UnitTests/StyleTests.cs
+++ b/tests/Perspex.Markup.Xaml.UnitTests/StyleTests.cs
@@ -92,9 +92,6 @@ namespace Perspex.Markup.Xaml.UnitTests
         [Fact]
         public void StyleResource_Can_Be_Assigned_To_Setter()
         {
-            // For some reason this type can't always be found if we don't do this.
-            var hack = typeof(KeyboardNavigation);
-
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
                 var xaml = @"