diff --git a/app/assets/javascripts/notes/components/issue_note.vue b/app/assets/javascripts/notes/components/issue_note.vue
index 600142a6866..ff854664046 100644
--- a/app/assets/javascripts/notes/components/issue_note.vue
+++ b/app/assets/javascripts/notes/components/issue_note.vue
@@ -73,7 +73,7 @@
             });
         }
       },
-      formUpdateHandler(noteText, parentElement) {
+      formUpdateHandler(noteText, parentElement, callback) {
         const data = {
           endpoint: this.note.path,
           note: {
@@ -94,7 +94,8 @@
             'Something went wrong while editing your comment. Please try again.',
             'alert',
             $(parentElement),
-          ));
+          ))
+          .then(callback);
       },
       formCancelHandler(shouldConfirm, isDirty) {
         if (shouldConfirm && isDirty) {
diff --git a/app/assets/javascripts/notes/components/issue_note_body.vue b/app/assets/javascripts/notes/components/issue_note_body.vue
index 8e35920e659..ec7ed4690ee 100644
--- a/app/assets/javascripts/notes/components/issue_note_body.vue
+++ b/app/assets/javascripts/notes/components/issue_note_body.vue
@@ -49,8 +49,8 @@
           });
         }
       },
-      handleFormUpdate(note, parentElement) {
-        this.$emit('handleFormUpdate', note, parentElement);
+      handleFormUpdate(note, parentElement, callback) {
+        this.$emit('handleFormUpdate', note, parentElement, callback);
       },
       formCancelHandler(shouldConfirm, isDirty) {
         this.$emit('cancelFormEdition', shouldConfirm, isDirty);
diff --git a/app/assets/javascripts/notes/components/issue_note_form.vue b/app/assets/javascripts/notes/components/issue_note_form.vue
index 591008a0285..626c0f2ce18 100644
--- a/app/assets/javascripts/notes/components/issue_note_form.vue
+++ b/app/assets/javascripts/notes/components/issue_note_form.vue
@@ -74,7 +74,10 @@
     methods: {
       handleUpdate() {
         this.isSubmitting = true;
-        this.$emit('handleFormUpdate', this.note, this.$refs.editNoteForm);
+
+        this.$emit('handleFormUpdate', this.note, this.$refs.editNoteForm, () => {
+          this.isSubmitting = false;
+        });
       },
       editMyLastNote() {
         if (this.note === '') {