diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml
index eaf2e79e..eb1c9de0 100644
--- a/src/Views/Checkout.axaml
+++ b/src/Views/Checkout.axaml
@@ -32,22 +32,21 @@
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Checkout.LocalChanges}"/>
-      <WrapPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-        <WrapPanel.Resources>
-          <ac:EnumToBoolConverter x:Key="EnumToBoolConverter"/>
-        </WrapPanel.Resources>
-        
+      <WrapPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">        
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
+                     x:Name="RadioDoNothing"
                      GroupName="LocalChanges"
                      Margin="0,0,8,0"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.DoNothing}}"/>
+                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
+                     x:Name="RadioStashAndReply"
                      GroupName="LocalChanges"
                      Margin="0,0,8,0"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.StashAndReaply}}"/>
+                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"
+                     x:Name="RadioDiscard"
                      GroupName="LocalChanges"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.Discard}}"/>
+                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
       </WrapPanel>
     </Grid>
   </StackPanel>
diff --git a/src/Views/Checkout.axaml.cs b/src/Views/Checkout.axaml.cs
index f8398a1d..da6e6b31 100644
--- a/src/Views/Checkout.axaml.cs
+++ b/src/Views/Checkout.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -8,5 +9,51 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+
+            var vm = DataContext as ViewModels.Checkout;
+            if (vm == null)
+                return;
+
+            switch (vm.PreAction)
+            {
+                case Models.DealWithLocalChanges.DoNothing:
+                    RadioDoNothing.IsChecked = true;
+                    break;
+                case Models.DealWithLocalChanges.StashAndReaply:
+                    RadioStashAndReply.IsChecked = true;
+                    break;
+                default:
+                    RadioDiscard.IsChecked = true;
+                    break;
+            }
+        }
+
+        private void OnLocalChangeActionIsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            var vm = DataContext as ViewModels.Checkout;
+            if (vm == null)
+                return;
+
+            if (RadioDoNothing.IsChecked == true)
+            {
+                if (vm.PreAction != Models.DealWithLocalChanges.DoNothing)
+                    vm.PreAction = Models.DealWithLocalChanges.DoNothing;
+                return;
+            }
+
+            if (RadioStashAndReply.IsChecked == true)
+            {
+                if (vm.PreAction != Models.DealWithLocalChanges.StashAndReaply)
+                    vm.PreAction = Models.DealWithLocalChanges.StashAndReaply;
+                return;
+            }
+
+            if (vm.PreAction != Models.DealWithLocalChanges.Discard)
+                vm.PreAction = Models.DealWithLocalChanges.Discard;
+        }
     }
 }
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index 3516c317..caea0be4 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -69,21 +69,20 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.CreateBranch.LocalChanges}"/>
       <WrapPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-        <WrapPanel.Resources>
-          <ac:EnumToBoolConverter x:Key="EnumToBoolConverter"/>
-        </WrapPanel.Resources>
-
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.DoNothing}"
+                     x:Name="RadioDoNothing"
                      GroupName="LocalChanges"
                      Margin="0,0,8,0"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.DoNothing}}"/>
+                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.StashAndReply}"
+                     x:Name="RadioStashAndReply"
                      GroupName="LocalChanges"
                      Margin="0,0,8,0"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.StashAndReaply}}"/>
+                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
         <RadioButton Content="{DynamicResource Text.CreateBranch.LocalChanges.Discard}"
+                     x:Name="RadioDiscard"
                      GroupName="LocalChanges"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.Discard}}"/>
+                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
       </WrapPanel>
       
       <CheckBox Grid.Row="3" Grid.Column="1"
diff --git a/src/Views/CreateBranch.axaml.cs b/src/Views/CreateBranch.axaml.cs
index 6626871b..6499e1c7 100644
--- a/src/Views/CreateBranch.axaml.cs
+++ b/src/Views/CreateBranch.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -8,5 +9,51 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+
+            var vm = DataContext as ViewModels.CreateBranch;
+            if (vm == null)
+                return;
+
+            switch (vm.PreAction)
+            {
+                case Models.DealWithLocalChanges.DoNothing:
+                    RadioDoNothing.IsChecked = true;
+                    break;
+                case Models.DealWithLocalChanges.StashAndReaply:
+                    RadioStashAndReply.IsChecked = true;
+                    break;
+                default:
+                    RadioDiscard.IsChecked = true;
+                    break;
+            }
+        }
+
+        private void OnLocalChangeActionIsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            var vm = DataContext as ViewModels.CreateBranch;
+            if (vm == null)
+                return;
+
+            if (RadioDoNothing.IsChecked == true)
+            {
+                if (vm.PreAction != Models.DealWithLocalChanges.DoNothing)
+                    vm.PreAction = Models.DealWithLocalChanges.DoNothing;
+                return;
+            }
+
+            if (RadioStashAndReply.IsChecked == true)
+            {
+                if (vm.PreAction != Models.DealWithLocalChanges.StashAndReaply)
+                    vm.PreAction = Models.DealWithLocalChanges.StashAndReaply;
+                return;
+            }
+
+            if (vm.PreAction != Models.DealWithLocalChanges.Discard)
+                vm.PreAction = Models.DealWithLocalChanges.Discard;
+        }
     }
 }
diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml
index a23bb5d5..f6aa245f 100644
--- a/src/Views/Pull.axaml
+++ b/src/Views/Pull.axaml
@@ -77,21 +77,20 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Pull.LocalChanges}"/>
       <WrapPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-        <WrapPanel.Resources>
-          <ac:EnumToBoolConverter x:Key="EnumToBoolConverter"/>
-        </WrapPanel.Resources>
-
         <RadioButton Content="{DynamicResource Text.Pull.LocalChanges.DoNothing}"
+                     x:Name="RadioDoNothing"
                      Margin="0,0,8,0"
                      GroupName="LocalChanges"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.DoNothing}}"/>
+                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
         <RadioButton Content="{DynamicResource Text.Pull.LocalChanges.StashAndReply}"
+                     x:Name="RadioStashAndReply"
                      Margin="0,0,8,0"
                      GroupName="LocalChanges"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.StashAndReaply}}"/>
+                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
         <RadioButton Content="{DynamicResource Text.Pull.LocalChanges.Discard}"
+                     x:Name="RadioDiscard"
                      GroupName="LocalChanges"
-                     IsChecked="{Binding PreAction, Mode=TwoWay, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static m:DealWithLocalChanges.Discard}}"/>
+                     IsCheckedChanged="OnLocalChangeActionIsCheckedChanged"/>
       </WrapPanel>
       
       <CheckBox Grid.Row="4" Grid.Column="1"
diff --git a/src/Views/Pull.axaml.cs b/src/Views/Pull.axaml.cs
index c6b4923e..3003f02c 100644
--- a/src/Views/Pull.axaml.cs
+++ b/src/Views/Pull.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -8,5 +9,51 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+
+            var vm = DataContext as ViewModels.Pull;
+            if (vm == null)
+                return;
+
+            switch (vm.PreAction)
+            {
+                case Models.DealWithLocalChanges.DoNothing:
+                    RadioDoNothing.IsChecked = true;
+                    break;
+                case Models.DealWithLocalChanges.StashAndReaply:
+                    RadioStashAndReply.IsChecked = true;
+                    break;
+                default:
+                    RadioDiscard.IsChecked = true;
+                    break;
+            }
+        }
+
+        private void OnLocalChangeActionIsCheckedChanged(object sender, RoutedEventArgs e)
+        {
+            var vm = DataContext as ViewModels.Pull;
+            if (vm == null)
+                return;
+
+            if (RadioDoNothing.IsChecked == true)
+            {
+                if (vm.PreAction != Models.DealWithLocalChanges.DoNothing)
+                    vm.PreAction = Models.DealWithLocalChanges.DoNothing;
+                return;
+            }
+
+            if (RadioStashAndReply.IsChecked == true)
+            {
+                if (vm.PreAction != Models.DealWithLocalChanges.StashAndReaply)
+                    vm.PreAction = Models.DealWithLocalChanges.StashAndReaply;
+                return;
+            }
+
+            if (vm.PreAction != Models.DealWithLocalChanges.Discard)
+                vm.PreAction = Models.DealWithLocalChanges.Discard;
+        }
     }
 }