diff --git a/app/assets/javascripts/notes/components/issue_note_form.vue b/app/assets/javascripts/notes/components/issue_note_form.vue
index 739a7df64a8111d7be6c708d43542f108e217ec9..cb37afd410a0e5c1b316ad313106e97a8ed0226f 100644
--- a/app/assets/javascripts/notes/components/issue_note_form.vue
+++ b/app/assets/javascripts/notes/components/issue_note_form.vue
@@ -1,4 +1,5 @@
 <script>
+  import { mapGetters } from 'vuex';
   import markdownField from '../../vue_shared/components/markdown/field.vue';
   import eventHub from '../event_hub';
 
@@ -19,7 +20,7 @@
         default: 'Save comment',
       },
       discussion: {
-        type: Array,
+        type: Object,
         required: false,
       }
     },
@@ -38,6 +39,9 @@
       markdownField,
     },
     computed: {
+      ...mapGetters([
+        'getDiscussionLastNote',
+      ]),
       noteHash() {
         return `#note_${this.noteId}`;
       },
@@ -48,17 +52,11 @@
       },
       editMyLastNote() {
         if (this.note === '') {
-          // TODO: HANDLE THIS WITHOUTH JQUERY OR QUERYING THE DOM
-          // FIND the discussion we are in and the last comment on that discussion
-          const discussion = $(this.$el).closest('.discussion-notes');
-          const myLastNoteId = discussion.find('.js-my-note').last().attr('id');
+          const lastNoteInDiscussion = this.getDiscussionLastNote(this.discussion, window.gon.current_user_id);
 
-          debugger;
-          const lastNoteInDiscussion = this.$store.getters.getDiscussionLastNote(this.discussion);
-
-          if (myLastNoteId) {
+          if (lastNoteInDiscussion) {
             eventHub.$emit('enterEditMode', {
-              noteId: parseInt(myLastNoteId.replace('note_', ''), 10),
+              noteId: lastNoteInDiscussion.id,
             });
           }
         }
diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js
index c454b834649fab67b44b0979b9bb7a3f1d54f38b..8dc24cd745e89a0e863bb7007766ae857a406d37 100644
--- a/app/assets/javascripts/notes/stores/getters.js
+++ b/app/assets/javascripts/notes/stores/getters.js
@@ -31,6 +31,6 @@ export const getCurrentUserLastNote = state => userId => reverseNotes(state.note
     return acc;
   }, []).filter(el => el !== undefined)[0];
 
-export const getDiscussionLastNote = state => (discussion, userId) => reverseNotes(discussion[0].notes)
+export const getDiscussionLastNote = state => (discussion, userId) => reverseNotes(discussion.notes)
   .find(el => isLastNote(el, userId));