diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index 6e7d616181..03a692f866 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -535,8 +535,6 @@
 
               <DataGridRowsPresenter Name="PART_RowsPresenter"
                                      Grid.Row="1"
-                                     Grid.RowSpan="2"
-                                     Grid.ColumnSpan="3"
                                      Grid.Column="0"
                                      ScrollViewer.IsScrollInertiaEnabled="{TemplateBinding IsScrollInertiaEnabled}">
                 <DataGridRowsPresenter.GestureRecognizers>
@@ -589,6 +587,10 @@
           <Setter Property="IsVisible" Value="False" />
         </Style>
       </Style>
+      <Style Selector="^ /template/ DataGridRowsPresenter#PART_RowsPresenter">
+        <Setter Property="Grid.RowSpan" Value="2" />
+        <Setter Property="Grid.ColumnSpan" Value="3" />
+      </Style>
     </ControlTheme>
    </ResourceDictionary>
   </Styles.Resources>