diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
index cc84b241ad..aa7e82fc8c 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
@@ -121,7 +121,7 @@
             <Popup x:Name="PART_Popup"
                    AllowsTransparency="True"
                    CustomPopupPlacementCallback="{x:Static wpf:CustomPopupPlacementCallbackHelper.LargePopupCallback}"
-                   Placement="Custom"
+                   Placement="Bottom"
                    PlacementTarget="{Binding ElementName=PART_TextBox}"
                    PopupAnimation="Fade"
                    StaysOpen="False" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml
index 28b5aa51bf..fed398a130 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml
@@ -133,7 +133,7 @@
             <Popup x:Name="PART_Popup"
                    AllowsTransparency="True"
                    CustomPopupPlacementCallback="{x:Static wpf:CustomPopupPlacementCallbackHelper.LargePopupCallback}"
-                   Placement="Custom"
+                   Placement="Bottom"
                    PlacementTarget="{Binding ElementName=PART_TextBox}"
                    PopupAnimation="Fade"
                    StaysOpen="False" />