1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_line_note_form.vue b/app/assets/javascripts/diffs/components/diff_line_note_form.vue
index 7a04ca6357c..5476fb47967 100644
--- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue
+++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue
@@ -57,10 +57,16 @@ export default {
     ...mapActions('diffs', ['cancelCommentForm']),
     ...mapActions(['saveNote', 'refetchDiscussionById']),
     handleCancelCommentForm() {
+      if (!window.confirm('Are you sure you want to cancel creating this comment?')) {
+        return;
+      }
+
       this.cancelCommentForm({
         lineCode: this.line.lineCode,
       });
-      this.resetAutoSave();
+      this.$nextTick(() => {
+        this.resetAutoSave();
+      });
     },
     handleSaveNote(note) {
       const selectedDiffFile = this.getDiffFileByHash(this.diffFileHash);