diff --git a/app/assets/javascripts/notes/components/issue_note.vue b/app/assets/javascripts/notes/components/issue_note.vue
index b91e6d05b8f56010c74f78b7fd23c90584a4da97..eb39cbd5e7c618bad30d0e708e6ebbcb633f7f67 100644
--- a/app/assets/javascripts/notes/components/issue_note.vue
+++ b/app/assets/javascripts/notes/components/issue_note.vue
@@ -57,8 +57,23 @@ export default {
           });
       }
     },
-    formUpdateHandler() {
-      // console.log('update requested', data);
+    formUpdateHandler(note) {
+      const data = {
+        endpoint: `${this.note.path}?full_data=1`,
+        note: {
+          target_type: 'issue',
+          target_id: this.note.noteable_id,
+          note,
+        },
+      };
+
+      this.$store.dispatch('updateNote', data)
+        .then(() => {
+          this.isEditing = false;
+        })
+        .catch(() => {
+          new Flash('Something went wrong while editing your comment. Please try again.'); // eslint-disable-line
+        });
     },
     formCancelHandler() {
       this.isEditing = false;
diff --git a/app/assets/javascripts/notes/components/issue_note_body.vue b/app/assets/javascripts/notes/components/issue_note_body.vue
index 4ce7d61251c7035cc1f88ccf9e13f765dacb3bba..4f11683c7a94d31c286fc81d17c25f7fb50ce32a 100644
--- a/app/assets/javascripts/notes/components/issue_note_body.vue
+++ b/app/assets/javascripts/notes/components/issue_note_body.vue
@@ -32,6 +32,11 @@ export default {
     renderGFM() {
       $(this.$refs['note-body']).renderGFM();
     },
+    handleFormUpdate() {
+      this.formUpdateHandler({
+        note: this.$refs.noteForm.note,
+      });
+    },
   },
   mounted() {
     this.renderGFM();
@@ -48,7 +53,8 @@ export default {
       class="note-text md"></div>
     <issue-note-form
       v-if="isEditing"
-      :updateHandler="formUpdateHandler"
+      ref="noteForm"
+      :updateHandler="handleFormUpdate"
       :cancelHandler="formCancelHandler"
       :noteBody="note.note" />
     <issue-note-edited-text
diff --git a/app/assets/javascripts/notes/services/issue_notes_service.js b/app/assets/javascripts/notes/services/issue_notes_service.js
index 629de6c0b76bc29126f4934d444f5a4696932cd4..645e9772c6853b3f40798ca109bb8fcd5d83c7ab 100644
--- a/app/assets/javascripts/notes/services/issue_notes_service.js
+++ b/app/assets/javascripts/notes/services/issue_notes_service.js
@@ -13,4 +13,7 @@ export default {
   replyToDiscussion(endpoint, data) {
     return Vue.http.post(endpoint, data, { emulateJSON: true });
   },
+  updateNote(endpoint, data) {
+    return Vue.http.put(endpoint, data, { emulateJSON: true });
+  },
 };
diff --git a/app/assets/javascripts/notes/stores/issue_notes_store.js b/app/assets/javascripts/notes/stores/issue_notes_store.js
index 3f27381b208fa1833e67408ef5f8ad93fed0da7c..2900208f51c93928c95d80e4f6977de268f15b28 100644
--- a/app/assets/javascripts/notes/stores/issue_notes_store.js
+++ b/app/assets/javascripts/notes/stores/issue_notes_store.js
@@ -42,6 +42,16 @@ const mutations = {
 
     noteObj.notes.push(note);
   },
+  updateNote(storeState, note) {
+    const noteObj = findNoteObjectById(storeState.notes, note.discussion_id);
+
+    if (noteObj.individual_note) {
+      noteObj.notes.splice(0, 1, note);
+    } else {
+      const comment = findNoteObjectById(noteObj.notes, note.id);
+      noteObj.notes.splice(noteObj.notes.indexOf(comment), 1, note);
+    }
+  },
 };
 
 const actions = {
@@ -70,6 +80,16 @@ const actions = {
         context.commit('addNewReplyToDiscussion', res);
       });
   },
+  updateNote(context, data) {
+    const { endpoint, note } = data;
+
+    return service
+      .updateNote(endpoint, note)
+      .then(res => res.json())
+      .then((res) => {
+        context.commit('updateNote', res);
+      });
+  },
 };
 
 export default {