diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml
index 4403d023ee..8db2533441 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml
@@ -303,11 +303,11 @@
                             Opacity="0.87"
                             TextElement.FontSize="{TemplateBinding wpf:ExpanderAssist.HeaderFontSize}" />
 
-              <Border Name="ContentSite">
+              <Border>
                 <Border.LayoutTransform>
                   <TransformGroup>
                     <ScaleTransform x:Name="ContentSiteScaleTransform" />
-                    <RotateTransform Angle="{Binding Path=ExpandDirection, RelativeSource={RelativeSource AncestorType=Expander}, Converter={x:Static convertersInternal:ExpanderRotateAngleConverter.Instance}}" />
+                    <RotateTransform Angle="{TemplateBinding ExpandDirection, Converter={x:Static convertersInternal:ExpanderRotateAngleConverter.Instance}}" />
                   </TransformGroup>
                 </Border.LayoutTransform>
 
@@ -316,7 +316,7 @@
                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                   <Grid.LayoutTransform>
-                    <RotateTransform Angle="{Binding Path=ExpandDirection, RelativeSource={RelativeSource AncestorType=Expander}, Converter={x:Static convertersInternal:ExpanderRotateAngleConverter.Instance}, ConverterParameter=-1}" />
+                    <RotateTransform Angle="{TemplateBinding ExpandDirection, Converter={x:Static convertersInternal:ExpanderRotateAngleConverter.Instance}, ConverterParameter=-1}" />
                   </Grid.LayoutTransform>
 
                   <ContentPresenter Name="PART_Content"