diff --git a/.changeset/kind-horses-sniff.md b/.changeset/kind-horses-sniff.md
new file mode 100644
index 00000000000..9a6afbd167e
--- /dev/null
+++ b/.changeset/kind-horses-sniff.md
@@ -0,0 +1,5 @@
+---
+"kilo-code": patch
+---
+
+Cancel auto-approve timer when editing follow-up suggestion
diff --git a/webview-ui/src/components/chat/FollowUpSuggest.tsx b/webview-ui/src/components/chat/FollowUpSuggest.tsx
index 1ffe31bbcba..3f5bc3a0171 100644
--- a/webview-ui/src/components/chat/FollowUpSuggest.tsx
+++ b/webview-ui/src/components/chat/FollowUpSuggest.tsx
@@ -134,6 +134,9 @@ export const FollowUpSuggest = ({
 								className="absolute top-0 right-0 opacity-0 group-hover:opacity-100 transition-opacity"
 								onClick={(e) => {
 									e.stopPropagation()
+									// Cancel the auto-approve timer when edit button is clicked
+									setSuggestionSelected(true)
+									onCancelAutoApproval?.()
 									// Simulate shift-click by directly calling the handler with shiftKey=true.
 									onSuggestionClick?.(suggestion, { ...e, shiftKey: true })
 								}}>