diff --git a/vscode/CHANGELOG.md b/vscode/CHANGELOG.md
index f8fef42b07..34ed22c73a 100644
--- a/vscode/CHANGELOG.md
+++ b/vscode/CHANGELOG.md
@@ -10,6 +10,8 @@ Starting from `0.2.0`, Cody is using `major.EVEN_NUMBER.patch` for release versi
 
 ### Fixed
 
+- Fixup: Updated the fixup create task to just use the previous command text. [pull/1615](https://github.com/sourcegraph/cody/pull/1615)
+
 ### Changed
 
 - Edit: Fixed formatting issues with some editor formatters that required explict indendation configuration. [pull/1620](https://github.com/sourcegraph/cody/pull/1620)
diff --git a/vscode/src/non-stop/FixupController.ts b/vscode/src/non-stop/FixupController.ts
index b2620a9272..6bdf7a106f 100644
--- a/vscode/src/non-stop/FixupController.ts
+++ b/vscode/src/non-stop/FixupController.ts
@@ -887,7 +887,7 @@ export class FixupController
         const document = await vscode.workspace.openTextDocument(task.fixupFile.uri)
 
         // Prompt the user for a new instruction, and create a new fixup
-        const instruction = (await this.typingUI.getInstructionFromQuickPick({ value: previousInstruction })).trim()
+        const instruction = await this.typingUI.getInstructionFromQuickPick({ value: previousInstruction })
 
         // Revert and remove the previous task
         await this.undoTask(task)
diff --git a/vscode/src/non-stop/FixupTask.ts b/vscode/src/non-stop/FixupTask.ts
index 9cc91478d1..da191e2bee 100644
--- a/vscode/src/non-stop/FixupTask.ts
+++ b/vscode/src/non-stop/FixupTask.ts
@@ -42,6 +42,7 @@ export class FixupTask {
         public source?: ChatEventSource
     ) {
         this.id = Date.now().toString(36).replaceAll(/\d+/g, '')
+        this.instruction = instruction.replace(/^\/edit/, '').trim()
     }
 
     /**