diff --git a/samples/BindingTest/MainWindow.xaml b/samples/BindingTest/MainWindow.xaml
index 09d8b0fe22..9bd6a3e3a8 100644
--- a/samples/BindingTest/MainWindow.xaml
+++ b/samples/BindingTest/MainWindow.xaml
@@ -71,9 +71,9 @@
     <TabItem Header="Commands">
       <StackPanel Margin="18" Gap="4" Width="200">
         <Button Content="Button" Command="{Binding StringValueCommand}" CommandParameter="Button"/>
-        <ToggleButton Content="ToggleButton" Command="{Binding StringValueCommand}" CommandParameter="ToggleButton"/>
-        <CheckBox Content="CheckBox" Command="{Binding StringValueCommand}" CommandParameter="CheckBox"/>
-        <RadioButton Content="RadionButton" Command="{Binding StringValueCommand}" CommandParameter="RadioButton"/>
+        <ToggleButton Content="ToggleButton" IsChecked="{Binding BooleanFlag, Mode=OneWay}" Command="{Binding StringValueCommand}" CommandParameter="ToggleButton"/>
+        <CheckBox Content="CheckBox" IsChecked="{Binding !BooleanFlag, Mode=OneWay}" Command="{Binding StringValueCommand}" CommandParameter="CheckBox"/>
+        <RadioButton Content="RadionButton" IsChecked="{Binding !!BooleanFlag, Mode=OneWay}" Command="{Binding StringValueCommand}" CommandParameter="RadioButton"/>
         <TextBox Text="{Binding Path=StringValue}"/>
       </StackPanel>
     </TabItem>
diff --git a/samples/BindingTest/ViewModels/MainWindowViewModel.cs b/samples/BindingTest/ViewModels/MainWindowViewModel.cs
index c4e59c9262..114ddf5cbf 100644
--- a/samples/BindingTest/ViewModels/MainWindowViewModel.cs
+++ b/samples/BindingTest/ViewModels/MainWindowViewModel.cs
@@ -11,6 +11,7 @@ namespace BindingTest.ViewModels
         private string _booleanString = "True";
         private double _doubleValue = 5.0;
         private string _stringValue = "Simple Binding";
+        private bool _booleanFlag = false;
 
         public MainWindowViewModel()
         {
@@ -31,7 +32,11 @@ namespace BindingTest.ViewModels
             });
 
             StringValueCommand = ReactiveCommand.Create();
-            StringValueCommand.Subscribe(param => StringValue = param.ToString());
+            StringValueCommand.Subscribe(param =>
+            {
+                BooleanFlag = !BooleanFlag;
+                StringValue = param.ToString();
+            });
         }
 
         public ObservableCollection<TestItem> Items { get; }
@@ -56,6 +61,12 @@ namespace BindingTest.ViewModels
             set { this.RaiseAndSetIfChanged(ref _stringValue, value); }
         }
 
+        public bool BooleanFlag
+        {
+            get { return _booleanFlag; }
+            set { this.RaiseAndSetIfChanged(ref _booleanFlag, value); }
+        }
+
         public ReactiveCommand<object> StringValueCommand { get; }
     }
 }
diff --git a/src/Perspex.Controls/Primitives/ToggleButton.cs b/src/Perspex.Controls/Primitives/ToggleButton.cs
index 9f7bd04fdc..3f6499137d 100644
--- a/src/Perspex.Controls/Primitives/ToggleButton.cs
+++ b/src/Perspex.Controls/Primitives/ToggleButton.cs
@@ -31,8 +31,8 @@ namespace Perspex.Controls.Primitives
 
         protected override void OnClick(RoutedEventArgs e)
         {
-            base.OnClick(e);
             Toggle();
+            base.OnClick(e);
         }
 
         protected virtual void Toggle()