diff --git a/FluentAutoClicker/MainPage.xaml b/FluentAutoClicker/MainPage.xaml
index 1a56715..4cb3a57 100644
--- a/FluentAutoClicker/MainPage.xaml
+++ b/FluentAutoClicker/MainPage.xaml
@@ -102,8 +102,7 @@
             <CheckBox
                 x:Name="ClickRepeatCheckBox"
                 x:Uid="ClickRepeatCheckBox"
-                Checked="ClickRepeatCheckBox_Checked"
-                Unchecked="ClickRepeatCheckBox_Unchecked" />
+                Click="CheckBox_Click" />
             <NumberBox
                 x:Name="ClickRepeatAmount"
                 HorizontalAlignment="Left"
@@ -121,8 +120,7 @@
             <CheckBox
                 x:Name="ClickOffsetCheckBox"
                 x:Uid="ClickOffsetCheckBox"
-                Checked="ClickOffsetCheckBox_Checked"
-                Unchecked="ClickOffsetCheckBox_Unchecked" />
+                Click="CheckBox_Click" />
             <NumberBox
                 x:Name="ClickOffsetAmount"
                 HorizontalAlignment="Left"
diff --git a/FluentAutoClicker/MainPage.xaml.cs b/FluentAutoClicker/MainPage.xaml.cs
index b644861..b7e7933 100644
--- a/FluentAutoClicker/MainPage.xaml.cs
+++ b/FluentAutoClicker/MainPage.xaml.cs
@@ -110,7 +110,7 @@ private void SetControlsEnabled(bool isEnabled)
         HotkeyTextBlock.Foreground = Application.Current.Resources[brushKey] as Brush;
     }
 
-    private int GetNumberBoxValue(NumberBox numberBox, int defaultValue)
+    private static int GetNumberBoxValue(NumberBox numberBox, int defaultValue)
     {
         if (!int.TryParse(numberBox.Value.ToString(CultureInfo.InvariantCulture), out int value))
         {
@@ -168,23 +168,15 @@ private void StartToggleButton_OnUnchecked(object sender, RoutedEventArgs e)
         SetControlsEnabled(true);
     }
 
-    private void ClickRepeatCheckBox_Unchecked(object sender, RoutedEventArgs e)
+    private void CheckBox_Click(object sender, RoutedEventArgs e)
     {
-        ClickRepeatAmount.IsEnabled = false;
-    }
-
-    private void ClickRepeatCheckBox_Checked(object sender, RoutedEventArgs e)
-    {
-        ClickRepeatAmount.IsEnabled = true;
-    }
-
-    private void ClickOffsetCheckBox_Unchecked(object sender, RoutedEventArgs e)
-    {
-        ClickOffsetAmount.IsEnabled = false;
-    }
-
-    private void ClickOffsetCheckBox_Checked(object sender, RoutedEventArgs e)
-    {
-        ClickOffsetAmount.IsEnabled = true;
+        if (sender.Equals(ClickRepeatCheckBox))
+        {
+            ClickRepeatAmount.IsEnabled = ClickRepeatCheckBox.IsChecked == true;
+        }
+        else if (sender.Equals(ClickOffsetCheckBox))
+        {
+            ClickOffsetAmount.IsEnabled = ClickOffsetCheckBox.IsChecked == true;
+        }
     }
-}
\ No newline at end of file
+}