diff --git a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
index 19dc917..64a6416 100644
--- a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
@@ -8,6 +8,7 @@
     <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
         <Setter Property="Background" Value="{DynamicResource AutoCompleteBoxDefaultBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource AutoCompleteBoxDefaultBorderBrush}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource AutoCompleteBoxCornerRadius}" />
         <Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="600" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Template">
diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 3d67fd1..c8afe84 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -48,15 +48,13 @@
                 <Setter Property="Button.Template">
                     <ControlTemplate TargetType="Button">
                         <!--  Background must be transparent or hit test will fail  -->
-                        <Label Background="Transparent">
-                            <Label.Content>
-                                <PathIcon
-                                    Width="16"
-                                    Height="16"
-                                    Data="{DynamicResource TextBoxClearButtonData}"
-                                    Foreground="{TemplateBinding Foreground}" />
-                            </Label.Content>
-                        </Label>
+                        <ContentControl Background="Transparent">
+                            <PathIcon
+                                Width="16"
+                                Height="16"
+                                Data="{DynamicResource TextBoxClearButtonData}"
+                                Foreground="{TemplateBinding Foreground}" />
+                        </ContentControl>
                     </ControlTemplate>
                 </Setter>
                 <Style Selector="^:pointerover">
diff --git a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
index b969a17..81ae115 100644
--- a/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
@@ -9,4 +9,5 @@
     <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
     <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#E6E8EA" />
+    <CornerRadius x:Key="AutoCompleteBoxCornerRadius">3</CornerRadius>
 </ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
index 2a44670..46dc2f1 100644
--- a/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
@@ -9,4 +9,5 @@
     <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
     <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
     <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" />
+    <CornerRadius x:Key="AutoCompleteBoxCornerRadius">3</CornerRadius>
 </ResourceDictionary>