diff --git a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
index 1acb160a17..65dc6591fd 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DatePicker.xaml
@@ -98,7 +98,7 @@
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     TemplatedControl.IsTemplateFocusTarget="True">
-              <Grid Name="PART_ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*">
+              <Grid Name="PART_ButtonContentGrid" ColumnDefinitions="78*,Auto,132*,Auto,78*" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                 <TextBlock Name="PART_DayTextBlock" Text="{DynamicResource StringDatePickerDayText}" HorizontalAlignment="Center"
                            Padding="{DynamicResource DatePickerHostPadding}" />
                 <TextBlock Name="PART_MonthTextBlock" Text="{DynamicResource StringDatePickerMonthText}" TextAlignment="Left"
diff --git a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
index 27e52fa152..0c1ff513fb 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml
@@ -97,7 +97,7 @@
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch">
 
-              <Grid Name="PART_FlyoutButtonContentGrid">
+              <Grid Name="PART_FlyoutButtonContentGrid" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                 <!--Ignore col defs here, set in code-->
                 <Border x:Name="PART_FirstPickerHost"
                         Grid.Column="0"
diff --git a/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
index d933afa43e..f7cf34d0dc 100644
--- a/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DatePicker.xaml
@@ -106,7 +106,8 @@
                     TemplatedControl.IsTemplateFocusTarget="True"
                     Theme="{StaticResource SimpleDatePickerFlyoutButton}">
               <Grid Name="PART_ButtonContentGrid"
-                    ColumnDefinitions="78*,Auto,132*,Auto,78*">
+                    ColumnDefinitions="78*,Auto,132*,Auto,78*"
+                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                 <TextBlock Name="PART_DayTextBlock"
                            Padding="{DynamicResource DatePickerHostPadding}"
                            HorizontalAlignment="Center"
diff --git a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
index 3a5e9ec1b1..7d9599238d 100644
--- a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
@@ -103,7 +103,7 @@
                     IsEnabled="{TemplateBinding IsEnabled}"
                     Theme="{StaticResource SimpleTimePickerFlyoutButton}">
 
-              <Grid Name="PART_FlyoutButtonContentGrid">
+              <Grid Name="PART_FlyoutButtonContentGrid" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                 <!--  Ignore col defs here, set in code  -->
                 <Border x:Name="PART_FirstPickerHost"
                         Grid.Column="0"
diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
index 523340a271..a875af0548 100644
--- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
@@ -13,6 +13,7 @@ using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
+using Avalonia.Layout;
 using Moq;
 using Xunit;
 
@@ -457,5 +458,57 @@ namespace Avalonia.Controls.UnitTests
                 return contentPanel;
             });
         }
+        
+        [Fact]
+        public void VerticalContentAlignment_Should_Propagate_To_Internal_Grid()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var picker = new DatePicker { VerticalContentAlignment = VerticalAlignment.Bottom };
+
+                picker.Template = new Avalonia.Controls.Templates.FuncControlTemplate<DatePicker>((parent, scope) =>
+                {
+                    var grid = new Grid { Name = "PART_ButtonContentGrid" };
+                    
+                    grid.Bind(Grid.VerticalAlignmentProperty, new Avalonia.Data.Binding("VerticalContentAlignment") 
+                    { 
+                        RelativeSource = new Avalonia.Data.RelativeSource(Avalonia.Data.RelativeSourceMode.TemplatedParent) 
+                    });
+
+                    var dayText = new TextBlock { Name = "PART_DayTextBlock" };
+                    var monthText = new TextBlock { Name = "PART_MonthTextBlock" };
+                    var yearText = new TextBlock { Name = "PART_YearTextBlock" };
+                    
+                    var firstSpacer = new Avalonia.Controls.Shapes.Rectangle { Name = "PART_FirstSpacer" };
+                    var secondSpacer = new Avalonia.Controls.Shapes.Rectangle { Name = "PART_SecondSpacer" };
+
+                    scope.Register("PART_ButtonContentGrid", grid);
+                    scope.Register("PART_DayTextBlock", dayText);
+                    scope.Register("PART_MonthTextBlock", monthText);
+                    scope.Register("PART_YearTextBlock", yearText);
+                    scope.Register("PART_FirstSpacer", firstSpacer);
+                    scope.Register("PART_SecondSpacer", secondSpacer);
+
+                    grid.Children.Add(dayText);
+                    grid.Children.Add(monthText);
+                    grid.Children.Add(yearText);
+                    grid.Children.Add(firstSpacer);
+                    grid.Children.Add(secondSpacer);
+
+                    return grid;
+                });
+
+                var root = new Avalonia.UnitTests.TestRoot { Child = picker };
+                root.Measure(new Avalonia.Size(100, 100));
+                root.Arrange(new Avalonia.Rect(0, 0, 100, 100));
+
+                var internalGrid = picker.GetVisualDescendants()
+                                        .OfType<Grid>()
+                                        .FirstOrDefault(g => g.Name == "PART_ButtonContentGrid");
+
+                Assert.NotNull(internalGrid);
+                Assert.Equal(VerticalAlignment.Bottom, internalGrid.VerticalAlignment);
+            }
+        }
     }
 }
diff --git a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
index 2c16c19f60..6d929b8f0e 100644
--- a/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TimePickerTests.cs
@@ -11,6 +11,7 @@ using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
+using Avalonia.Layout;
 using Moq;
 using Xunit;
 
@@ -484,5 +485,36 @@ namespace Avalonia.Controls.UnitTests
             var timePicker = new TimePicker();
             Assert.Equal(Avalonia.Layout.VerticalAlignment.Stretch, timePicker.VerticalContentAlignment);
         }
+
+        [Fact]
+        public void VerticalContentAlignment_Should_Propagate_To_Internal_Grid()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var picker = new TimePicker { VerticalContentAlignment = VerticalAlignment.Bottom };
+
+                picker.Template = new Avalonia.Controls.Templates.FuncControlTemplate<TimePicker>((parent, scope) =>
+                {
+                    var grid = new Grid { Name = "PART_FlyoutButtonContentGrid" };
+                    
+                    grid.Bind(Grid.VerticalAlignmentProperty, new Avalonia.Data.Binding("VerticalContentAlignment") 
+                    { 
+                        RelativeSource = new Avalonia.Data.RelativeSource(Avalonia.Data.RelativeSourceMode.TemplatedParent) 
+                    });
+                    return grid;
+                });
+
+                var root = new Avalonia.UnitTests.TestRoot { Child = picker };
+                root.Measure(new Avalonia.Size(100, 100));
+                root.Arrange(new Avalonia.Rect(0, 0, 100, 100));
+
+                var internalGrid = picker.GetVisualDescendants()
+                                        .OfType<Grid>()
+                                        .FirstOrDefault(g => g.Name == "PART_FlyoutButtonContentGrid");
+
+                Assert.NotNull(internalGrid);
+                Assert.Equal(VerticalAlignment.Bottom, internalGrid.VerticalAlignment);
+            }
+        }
     }
 }