diff --git a/ILSpy.BamlDecompiler.Tests/Cases/AvalonDockCommon.xaml b/ILSpy.BamlDecompiler.Tests/Cases/AvalonDockCommon.xaml
index 31d456472..9fa0840bd 100644
--- a/ILSpy.BamlDecompiler.Tests/Cases/AvalonDockCommon.xaml
+++ b/ILSpy.BamlDecompiler.Tests/Cases/AvalonDockCommon.xaml
@@ -21,7 +21,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ad:Resizer}">
-					<Border Background="{TemplateBinding Background}" />
+					<Border Background="{TemplateBinding Control.Background}" />
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
diff --git a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs b/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs
index 284b4a881..66da03452 100644
--- a/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs
+++ b/ILSpy.BamlDecompiler/Handlers/Records/PropertyWithExtensionHandler.cs
@@ -59,7 +59,7 @@ namespace ILSpy.BamlDecompiler.Handlers
 				var value = ctx.ResolveProperty(record.ValueId);
 
 				value.DeclaringType.ResolveNamespace(parent.Xaml, ctx);
-				var xName = value.ToXName(ctx, parent.Xaml, false);
+				var xName = value.ToXName(ctx, parent.Xaml, true);
 
 				ext.Initializer = new object[] { ctx.ToString(parent.Xaml, xName) };
 			}