diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index 8c7c80c..59b65db 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -468,11 +468,17 @@
                                     Name="PART_Watermark"
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
                                     Opacity="0.5"
                                     Text="{TemplateBinding Watermark}"
                                     TextAlignment="{TemplateBinding TextAlignment}"
-                                    TextWrapping="{TemplateBinding TextWrapping}" />
+                                    TextWrapping="{TemplateBinding TextWrapping}">
+                                    <TextBlock.IsVisible>
+                                        <MultiBinding Converter="{x:Static BoolConverters.And}">
+                                            <Binding ElementName="PART_TextPresenter" Path="PreeditText" Converter="{x:Static StringConverters.IsNullOrEmpty}" />
+                                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Text" Converter="{x:Static StringConverters.IsNullOrEmpty}" />
+                                        </MultiBinding>
+                                    </TextBlock.IsVisible>
+                                </TextBlock>
                                 <TextPresenter
                                     Name="PART_TextPresenter"
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -540,4 +546,4 @@
         </Style>
     </ControlTheme>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>