diff --git a/samples/ControlCatalog/Pages/ButtonPage.xaml b/samples/ControlCatalog/Pages/ButtonPage.xaml
index 39d89590c2..cc7553f6a0 100644
--- a/samples/ControlCatalog/Pages/ButtonPage.xaml
+++ b/samples/ControlCatalog/Pages/ButtonPage.xaml
@@ -24,7 +24,10 @@
             </Style>
           </Button.Styles>          
         </Button>
-      </StackPanel>
+        <RepeatButton Name="RepeatButton">
+          <TextBlock Name="RepeatButtonTextBlock" Text="Repeat Button: 0" />
+        </RepeatButton>      
+    </StackPanel>
 
       <StackPanel Orientation="Vertical" Spacing="8" Width="150">
         <Button BorderThickness="0">No Border</Button>
diff --git a/samples/ControlCatalog/Pages/ButtonPage.xaml.cs b/samples/ControlCatalog/Pages/ButtonPage.xaml.cs
index 1d0c228a0e..5e555c8c91 100644
--- a/samples/ControlCatalog/Pages/ButtonPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ButtonPage.xaml.cs
@@ -5,5 +5,25 @@ namespace ControlCatalog.Pages
 {
     public class ButtonPage : UserControl
     {
+        private int repeatButtonClickCount = 0;
+
+        public ButtonPage()
+        {
+            InitializeComponent();
+
+            this.FindControl<RepeatButton>("RepeatButton").Click += OnRepeatButtonClick;
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public void OnRepeatButtonClick(object sender, object args)
+        {
+            repeatButtonClickCount++;
+            var textBlock = this.FindControl<TextBlock>("RepeatButtonTextBlock");
+            textBlock.Text = $"Repeat Button: {repeatButtonClickCount}";
+        }
     }
 }
diff --git a/src/Avalonia.Themes.Fluent/Button.xaml b/src/Avalonia.Themes.Fluent/Button.xaml
index ba5c59b6d3..3336e611c1 100644
--- a/src/Avalonia.Themes.Fluent/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Button.xaml
@@ -2,10 +2,8 @@
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
-        <Button Content="Click Me!" Width="100" />
-        <Button Classes="accent"
-                Content="Click Me!"
-                Width="100" />
+        <Button Content="Click Me!" />
+        <Button Classes="accent" Content="Click Me!" />
         <RepeatButton Content="RepeatButton" Width="100" />
       </StackPanel>
     </Border>