diff --git a/src/Avalonia.Themes.Fluent/ComboBox.xaml b/src/Avalonia.Themes.Fluent/ComboBox.xaml
index f77f1b582b..8155264f18 100644
--- a/src/Avalonia.Themes.Fluent/ComboBox.xaml
+++ b/src/Avalonia.Themes.Fluent/ComboBox.xaml
@@ -61,7 +61,6 @@
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}"
                   MinWidth="{DynamicResource ComboBoxThemeMinWidth}" />
 
           <Border x:Name="HighlightBackground"
@@ -70,8 +69,7 @@
                   Grid.ColumnSpan="2"
                   Background="{DynamicResource ComboBoxBackgroundUnfocused}"
                   BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{DynamicResource ControlCornerRadius}" />
+                  BorderThickness="{TemplateBinding BorderThickness}" />
           <TextBlock x:Name="PlaceholderTextBlock"
                      Grid.Row="1"
                      Grid.Column="0"
@@ -226,4 +224,12 @@
   <Style Selector="ComboBox:focused:pressed /template/ Path#DropDownGlyph">
     <Setter Property="Fill" Value="{DynamicResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
   </Style>
+  
+  <Style Selector="ComboBox /template/ Border#Background">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
+  
+  <Style Selector="ComboBox /template/ Border#HighlightBackground">
+    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+  </Style>
 </Styles>