diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
index 8060f20f2..f180c94e9 100644
--- a/src/ViewModels/CreateBranch.cs
+++ b/src/ViewModels/CreateBranch.cs
@@ -77,7 +77,9 @@ public CreateBranch(Repository repo, Models.Branch branch)
                 Name = branch.Name;
 
             BasedOn = branch;
-            DealWithLocalChanges = Models.DealWithLocalChanges.DoNothing;
+            DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
+                Models.DealWithLocalChanges.StashAndReapply :
+                Models.DealWithLocalChanges.DoNothing;
             UpdateOverrideTip();
         }
 
@@ -89,7 +91,9 @@ public CreateBranch(Repository repo, Models.Commit commit)
             _head = commit.SHA;
 
             BasedOn = commit;
-            DealWithLocalChanges = Models.DealWithLocalChanges.DoNothing;
+            DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
+                Models.DealWithLocalChanges.StashAndReapply :
+                Models.DealWithLocalChanges.DoNothing;
             UpdateOverrideTip();
         }
 
@@ -101,7 +105,9 @@ public CreateBranch(Repository repo, Models.Tag tag)
             _head = tag.SHA;
 
             BasedOn = tag;
-            DealWithLocalChanges = Models.DealWithLocalChanges.DoNothing;
+            DealWithLocalChanges = Preferences.Instance.UseStashAndReapplyByDefault ?
+                Models.DealWithLocalChanges.StashAndReapply :
+                Models.DealWithLocalChanges.DoNothing;
             UpdateOverrideTip();
         }