diff --git a/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.xaml b/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.xaml
index 50e73001..320eb769 100644
--- a/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.xaml
+++ b/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.xaml
@@ -472,6 +472,8 @@
                         x:Name="LayoutRoot"
                         Background="{TemplateBinding Background}"
                         Padding="{TemplateBinding Padding}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}"
                         SnapsToDevicePixels="True">
                         <VisualStateManager.VisualStateGroups>
@@ -481,19 +483,13 @@
                                 <VisualState x:Name="FullWidthOpenUp" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Grid>
-                            <Border
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding CornerRadius}" />
-                            <ScrollViewer
-                                Content="{TemplateBinding Content}"
-                                Margin="{TemplateBinding BorderThickness}"
-                                Padding="0,4,0,4"
-                                HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </Grid>
+                        <ScrollViewer
+                            Content="{TemplateBinding Content}"
+                            Margin="{TemplateBinding BorderThickness}"
+                            Padding="0,4,0,4"
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/ModernWpf/Styles/Calendar.xaml b/ModernWpf/Styles/Calendar.xaml
index f480c443..9f4d47c4 100644
--- a/ModernWpf/Styles/Calendar.xaml
+++ b/ModernWpf/Styles/Calendar.xaml
@@ -53,17 +53,15 @@
                                     <Setter.Value>
                                         <ControlTemplate TargetType="Button">
                                             <Border
+                                                x:Name="Border"
                                                 Background="{TemplateBinding Background}"
+                                                BorderBrush="{DynamicResource CalendarViewNavigationButtonBorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
                                                 Margin="{TemplateBinding Padding}">
-                                                <Border
-                                                    x:Name="Border"
-                                                    BorderBrush="{DynamicResource CalendarViewNavigationButtonBorderBrush}"
-                                                    BorderThickness="{TemplateBinding BorderThickness}">
-                                                    <ContentPresenter
-                                                        x:Name="Text"
-                                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                                                </Border>
+                                                <ContentPresenter
+                                                    x:Name="Text"
+                                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
                                             </Border>
                                             <ControlTemplate.Triggers>
                                                 <Trigger Property="IsMouseOver" Value="True">
diff --git a/ModernWpf/Styles/ComboBox.xaml b/ModernWpf/Styles/ComboBox.xaml
index 35d9cca4..1ea5a1e2 100644
--- a/ModernWpf/Styles/ComboBox.xaml
+++ b/ModernWpf/Styles/ComboBox.xaml
@@ -471,26 +471,23 @@
                                 <Border
                                     x:Name="PopupBorder"
                                     Background="{DynamicResource ComboBoxDropDownBackground}"
+                                    BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
+                                    BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
+                                    Margin="0,-0.5,0,-1"
+                                    Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
                                     HorizontalAlignment="Stretch"
                                     CornerRadius="{DynamicResource OverlayCornerRadius}">
-                                    <Border
-                                        BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
-                                        BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
-                                        Margin="0,-0.5,0,-1"
-                                        Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
-                                        CornerRadius="{Binding ElementName=PopupBorder, Path=CornerRadius}">
-                                        <ScrollViewer
-                                            x:Name="ScrollViewer"
-                                            Foreground="{DynamicResource ComboBoxDropDownForeground}"
-                                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                            IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}">
-                                            <ItemsPresenter
-                                                Margin="{DynamicResource ComboBoxDropdownContentMargin}"
-                                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                        </ScrollViewer>
-                                    </Border>
+                                    <ScrollViewer
+                                        x:Name="ScrollViewer"
+                                        Foreground="{DynamicResource ComboBoxDropDownForeground}"
+                                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                        IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}">
+                                        <ItemsPresenter
+                                            Margin="{DynamicResource ComboBoxDropdownContentMargin}"
+                                            KeyboardNavigation.DirectionalNavigation="Contained"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </ScrollViewer>
                                 </Border>
                             </primitives:ThemeShadowChrome>
                         </Popup>