diff --git a/apps/server/src/git/Layers/GitManager.ts b/apps/server/src/git/Layers/GitManager.ts
index 0122e26724ddf53848c4f11ef994201b12af21d9..3cd812afe0195698579ab355751aa269819ef32f 100644
--- a/apps/server/src/git/Layers/GitManager.ts
+++ b/apps/server/src/git/Layers/GitManager.ts
@@ -451,7 +451,7 @@ export const makeGitManager = Effect.gen(function* () {
       const resolvedBranch = resolveAutoFeatureBranchName(existingBranchNames, preferredBranch);
 
       yield* gitCore.createBranch({ cwd, branch: resolvedBranch });
-      yield* gitCore.checkoutBranch({ cwd, branch: resolvedBranch });
+      yield* Effect.scoped(gitCore.checkoutBranch({ cwd, branch: resolvedBranch }));
 
       return {
         branchStep: { status: "created" as const, name: resolvedBranch },