diff --git a/packages/handoff/src/index.ts b/packages/handoff/src/index.ts
index 97d0b9e1c2909a32ae594904c29e968cf10bcfdd..a619ff6a09862d818a578a7baafda421f06d63a8 100644
--- a/packages/handoff/src/index.ts
+++ b/packages/handoff/src/index.ts
@@ -191,6 +191,9 @@ export default function (pi: ExtensionAPI) {
 		handoffTimestamp = Date.now();
 
 		setTimeout(async () => {
+			ctx.ui.setEditorText(prompt);
+			startCountdown(ctx);
+
 			if (newModel) {
 				const slashIdx = newModel.indexOf("/");
 				if (slashIdx > 0) {
@@ -200,7 +203,6 @@ export default function (pi: ExtensionAPI) {
 					if (model) await pi.setModel(model);
 				}
 			}
-			pi.sendUserMessage(prompt);
 		}, 0);
 	});