diff --git a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
index 111c9ff6235..d1452985635 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
@@ -24,9 +24,9 @@ namespace Avalonia.Controls
     [TemplatePart("PART_Popup",                   typeof(Popup))]
     [TemplatePart("PART_SecondColumnDivider",     typeof(Rectangle))]
     [TemplatePart("PART_SecondPickerHost",        typeof(Border))]
-    [TemplatePart("PART_ThirdColumnDivider",     typeof(Rectangle))]
-    [TemplatePart("PART_ThirdPickerHost",        typeof(Border))]
-    [TemplatePart("PART_FourthPickerHost",         typeof(Border))]
+    [TemplatePart("PART_ThirdColumnDivider",      typeof(Rectangle))]
+    [TemplatePart("PART_ThirdPickerHost",         typeof(Border))]
+    [TemplatePart("PART_FourthPickerHost",        typeof(Border))]
     [PseudoClasses(":hasnotime")]
     public class TimePicker : TemplatedControl
     {
diff --git a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
index 3a74278ebd8..3a5e9ec1b14 100644
--- a/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TimePicker.xaml
@@ -173,12 +173,6 @@
                              FontSize="{TemplateBinding FontSize}"
                              FontWeight="{TemplateBinding FontWeight}" />
                 </Border>
-                
-                <Rectangle Name="PART_ThirdColumnDivider"
-                           Grid.Column="5"
-                           Width="{DynamicResource TimePickerSpacerThemeWidth}"
-                           HorizontalAlignment="Center"
-                           Fill="{DynamicResource TimePickerSpacerFill}" />
               </Grid>
             </Button>