diff --git a/src/Wpf.Ui/Controls/Hyperlink.cs b/src/Wpf.Ui/Controls/Hyperlink.cs
index c014c017c..b89af7edd 100644
--- a/src/Wpf.Ui/Controls/Hyperlink.cs
+++ b/src/Wpf.Ui/Controls/Hyperlink.cs
@@ -32,11 +32,11 @@ public string NavigateUri
 
     protected override void OnClick()
     {
-        RoutedEventArgs newEvent = new RoutedEventArgs(ButtonBase.ClickEvent, this);
-        RaiseEvent(newEvent);
-
-        if (newEvent.Handled || string.IsNullOrEmpty(NavigateUri))
+        base.OnClick();
+        if (string.IsNullOrEmpty(NavigateUri))
+        {
             return;
+        }
 
         try
         {
diff --git a/src/Wpf.Ui/Styles/Controls/CheckBox.xaml b/src/Wpf.Ui/Styles/Controls/CheckBox.xaml
index c9986ab26..9b9979137 100644
--- a/src/Wpf.Ui/Styles/Controls/CheckBox.xaml
+++ b/src/Wpf.Ui/Styles/Controls/CheckBox.xaml
@@ -109,9 +109,11 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="Content" Value="{x:Null}">
                             <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
+                            <Setter Property="MinWidth" Value="30" />
                         </Trigger>
                         <Trigger Property="Content" Value="">
                             <Setter TargetName="ContentPresenter" Property="Margin" Value="0" />
+                            <Setter Property="MinWidth" Value="30" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="{x:Null}">
                             <Setter TargetName="ControlIcon" Property="Symbol" Value="Subtract16" />