diff --git a/samples/ControlCatalog/Pages/TextBoxPage.xaml b/samples/ControlCatalog/Pages/TextBoxPage.xaml
index 795e675f70..093e3087e5 100644
--- a/samples/ControlCatalog/Pages/TextBoxPage.xaml
+++ b/samples/ControlCatalog/Pages/TextBoxPage.xaml
@@ -6,9 +6,9 @@
       <StackPanel.Styles>
         <Style Selector="TextBox">
           <Setter Property="InnerRightContent">
-            <DataTemplate>
+            <ControlTemplate>
               <Button Content="Clear" />
-            </DataTemplate>
+            </ControlTemplate>
           </Setter>
 
         </Style>
diff --git a/src/Avalonia.Themes.Fluent/TextBox.xaml b/src/Avalonia.Themes.Fluent/TextBox.xaml
index ec232b33ae..4e96751bc6 100644
--- a/src/Avalonia.Themes.Fluent/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/TextBox.xaml
@@ -86,7 +86,7 @@
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> 
                       </Panel>
-                      <ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerLeftContent}"/>
+                      <ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}"/>
                     </Grid>
                   </ScrollViewer>
                 </DataValidationErrors>