diff --git a/src/AtomUI.Controls.DataGrid/Cell/DataGridCell.cs b/src/AtomUI.Controls.DataGrid/Cell/DataGridCell.cs
index 97e530b0e..bf5e71c30 100644
--- a/src/AtomUI.Controls.DataGrid/Cell/DataGridCell.cs
+++ b/src/AtomUI.Controls.DataGrid/Cell/DataGridCell.cs
@@ -10,6 +10,7 @@ using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
+using Avalonia.Layout;
 using Avalonia.Rendering;
 
 namespace AtomUI.Controls;
@@ -102,6 +103,12 @@ public class DataGridCell : ContentControl, ICustomHitTest
     
     private Rectangle? _rightGridLine;
 
+    static DataGridCell()
+    {
+        HorizontalContentAlignmentProperty.OverrideDefaultValue<DataGridCell>(HorizontalAlignment.Left);
+        VerticalContentAlignmentProperty.OverrideDefaultValue<DataGridCell>(VerticalAlignment.Center);
+    }
+
     /// <summary>
     /// Builds the visual tree for the cell control when a new template is applied.
     /// </summary>
diff --git a/src/AtomUI.Controls.DataGrid/Theme/DataGridCellTheme.cs b/src/AtomUI.Controls.DataGrid/Theme/DataGridCellTheme.cs
index 2410e231c..7ca546957 100644
--- a/src/AtomUI.Controls.DataGrid/Theme/DataGridCellTheme.cs
+++ b/src/AtomUI.Controls.DataGrid/Theme/DataGridCellTheme.cs
@@ -62,11 +62,13 @@ internal class DataGridCellTheme : BaseControlTheme
 
             var contentPresenter = new ContentPresenter()
             {
-                Name = ContentPresenterPart
+                Name = ContentPresenterPart,
+                HorizontalAlignment = HorizontalAlignment.Stretch,
+                VerticalAlignment = VerticalAlignment.Stretch,
             };
             CreateTemplateParentBinding(contentPresenter, ContentPresenter.MarginProperty, DataGridCell.PaddingProperty);
-            CreateTemplateParentBinding(contentPresenter, ContentPresenter.HorizontalAlignmentProperty, DataGridCell.HorizontalContentAlignmentProperty);
-            CreateTemplateParentBinding(contentPresenter, ContentPresenter.VerticalAlignmentProperty, DataGridCell.VerticalContentAlignmentProperty);
+            CreateTemplateParentBinding(contentPresenter, ContentPresenter.HorizontalContentAlignmentProperty, DataGridCell.HorizontalContentAlignmentProperty);
+            CreateTemplateParentBinding(contentPresenter, ContentPresenter.VerticalContentAlignmentProperty, DataGridCell.VerticalContentAlignmentProperty);
             CreateTemplateParentBinding(contentPresenter, ContentPresenter.ContentProperty, DataGridCell.ContentProperty);
             CreateTemplateParentBinding(contentPresenter, ContentPresenter.ContentTemplateProperty, DataGridCell.ContentTemplateProperty);
             CreateTemplateParentBinding(contentPresenter, ContentPresenter.ForegroundProperty, DataGridCell.ForegroundProperty);
@@ -90,8 +92,9 @@ internal class DataGridCellTheme : BaseControlTheme
             {
                 Name = RightGridLinePart,
                 VerticalAlignment = VerticalAlignment.Stretch,
+                Width = 1
             };
-            Grid.SetColumn(contentPresenter, 1);
+            Grid.SetColumn(rightGridLine, 1);
             rootLayout.Children.Add(rightGridLine);
             
             frame.Child = rootLayout;
@@ -108,7 +111,7 @@ internal class DataGridCellTheme : BaseControlTheme
             IsHitTestVisible = false,
         };
 
-        var primaryFocusVisual = new Rectangle()
+        var primaryFocusVisual = new Rectangle
         {
             HorizontalAlignment = HorizontalAlignment.Stretch,
             VerticalAlignment = VerticalAlignment.Stretch,