diff --git a/src/app/ManualRebase.tsx b/src/app/ManualRebase.tsx
index 1880786..777ae8e 100644
--- a/src/app/ManualRebase.tsx
+++ b/src/app/ManualRebase.tsx
@@ -147,6 +147,7 @@ async function run() {
     // always hard reset and clean to allow subsequent checkout
     // if there are files checkout will fail and cascade fail subsequent commands
     cli.sync(`git reset --hard`, spawn_options);
+    cli.sync(`git cherry-pick --abort`, spawn_options);
     cli.sync(`git clean -fd`, spawn_options);
 
     // always put self back in original branch
diff --git a/src/commands/Rebase.tsx b/src/commands/Rebase.tsx
index 186e6a5..3374b30 100644
--- a/src/commands/Rebase.tsx
+++ b/src/commands/Rebase.tsx
@@ -184,6 +184,7 @@ Rebase.run = async function run(props: Props) {
     // always hard reset and clean to allow subsequent checkout
     // if there are files checkout will fail and cascade fail subsequent commands
     cli.sync(`git reset --hard`, spawn_options);
+    cli.sync(`git cherry-pick --abort`, spawn_options);
     cli.sync(`git clean -fd`, spawn_options);
 
     // always put self back in original branch