diff --git a/MainDemo.Wpf/DataGrids.xaml b/MainDemo.Wpf/DataGrids.xaml
index d33b50ed9b..1f4a9aa80e 100644
--- a/MainDemo.Wpf/DataGrids.xaml
+++ b/MainDemo.Wpf/DataGrids.xaml
@@ -32,22 +32,20 @@
                 SelectedIndex="0" />
     </StackPanel>
 
+    <FrameworkElement x:Name="DataContextProxy" DataContext="{Binding}"/>
+
     <smtx:XamlDisplay UniqueKey="grids_1">
       <DataGrid AutoGenerateColumns="False"
                 CanUserAddRows="False"
                 HeadersVisibility="All"
                 ItemsSource="{Binding Items1}"
                 SelectionUnit="{Binding ElementName=selectionUnitComboBox, Path=SelectedValue}">
-        <DataGrid.Resources>
-          <domain:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
-        </DataGrid.Resources>
-
         <DataGrid.Columns>
           <!-- by default a DataGridCheckBoxColumn will have the MaterialDesignDataGridCheckBoxColumnStyle and MaterialDesignDataGridCheckBoxColumnEditingStyle applied. See DataGridAssist.ApplyMaterialDesignColumnStyles attached property -->
           <DataGridCheckBoxColumn Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}">
             <DataGridCheckBoxColumn.Header>
               <Border Background="Transparent">
-                <CheckBox IsChecked="{Binding Data.IsAllItems1Selected, Source={StaticResource DataContextProxy}}" />
+                <CheckBox IsChecked="{Binding DataContext.IsAllItems1Selected, Source={x:Reference DataContextProxy}}" />
               </Border>
             </DataGridCheckBoxColumn.Header>
 
diff --git a/MainDemo.Wpf/Domain/BindingProxy.cs b/MainDemo.Wpf/Domain/BindingProxy.cs
deleted file mode 100644
index 9bd6e4a7bb..0000000000
--- a/MainDemo.Wpf/Domain/BindingProxy.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace MaterialDesignDemo.Domain;
-
-public class BindingProxy : DependencyObject
-{
-    public object? Data
-    {
-        get => GetValue(DataProperty);
-        set => SetValue(DataProperty, value);
-    }
-
-    public static readonly DependencyProperty DataProperty =
-        DependencyProperty.Register("Data", typeof(object), typeof(BindingProxy), new UIPropertyMetadata(null));
-}
diff --git a/MaterialDesign3.Demo.Wpf/DataGrids.xaml b/MaterialDesign3.Demo.Wpf/DataGrids.xaml
index c462810525..2ec3c89010 100644
--- a/MaterialDesign3.Demo.Wpf/DataGrids.xaml
+++ b/MaterialDesign3.Demo.Wpf/DataGrids.xaml
@@ -22,22 +22,20 @@
   <StackPanel>
     <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="Custom Columns" />
 
+    <FrameworkElement x:Name="DataContextProxy" DataContext="{Binding}"/>
+
     <smtx:XamlDisplay UniqueKey="grids_1">
       <DataGrid AutoGenerateColumns="False"
                 CanUserAddRows="False"
                 HeadersVisibility="All"
                 ItemsSource="{Binding Items1}">
-        <DataGrid.Resources>
-          <domain:BindingProxy x:Key="DataContextProxy" Data="{Binding}" />
-        </DataGrid.Resources>
-
         <DataGrid.Columns>
           <DataGridCheckBoxColumn Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}"
                                   EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}"
                                   ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}">
             <DataGridCheckBoxColumn.Header>
               <Border Background="Transparent">
-                <CheckBox IsChecked="{Binding Data.IsAllItems1Selected, Source={StaticResource DataContextProxy}}" />
+                <CheckBox IsChecked="{Binding DataContext.IsAllItems1Selected, Source={x:Reference DataContextProxy}}" />
               </Border>
             </DataGridCheckBoxColumn.Header>
 
diff --git a/MaterialDesign3.Demo.Wpf/Domain/BindingProxy.cs b/MaterialDesign3.Demo.Wpf/Domain/BindingProxy.cs
deleted file mode 100644
index a35ab12688..0000000000
--- a/MaterialDesign3.Demo.Wpf/Domain/BindingProxy.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace MaterialDesign3Demo.Domain;
-
-public class BindingProxy : DependencyObject
-{
-    public object? Data
-    {
-        get => GetValue(DataProperty);
-        set => SetValue(DataProperty, value);
-    }
-
-    public static readonly DependencyProperty DataProperty =
-        DependencyProperty.Register("Data", typeof(object), typeof(BindingProxy), new UIPropertyMetadata(null));
-}