diff --git a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6 b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
index 9c2dc158a14..a0c859ab7f6 100644
--- a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
+++ b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
@@ -56,7 +56,7 @@
         }
 
         if (nextUnresolvedDiscussionId) {
-          $.scrollTo(`.${nextUnresolvedDiscussionId}`, {
+          $.scrollTo(`.discussion[data-discussion-id="${nextUnresolvedDiscussionId}"]`, {
             offset: -($('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight())
           });
         }
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6
index 64d44085a64..50392e76fbe 100644
--- a/app/assets/javascripts/diff_notes/services/resolve.js.es6
+++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6
@@ -83,13 +83,13 @@
     }
 
     updateUpdatedHtml(discussionId, data) {
-      const $discussionHeadline = $(`.${discussionId} .js-discussion-headline`);
+      const $discussionHeadline = $(`.discussion[data-discussion-id="${discussionId}"] .js-discussion-headline`);
 
-      if (data.updated_html) {
+      if (data.discussion_headline_html) {
         if ($discussionHeadline.length) {
-          $discussionHeadline.replaceWith(data.updated_html);
+          $discussionHeadline.replaceWith(data.discussion_headline_html);
         } else {
-          $(`.${discussionId} .discussion-header`).append(data.updated_html);
+          $(`.discussion[data-discussion-id="${discussionId}"] .discussion-header`).append(data.discussion_headline_html);
         }
       } else {
          $discussionHeadline.remove();
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml
index e58f26c5ab3..077e8e64e5f 100644
--- a/app/views/discussions/_discussion.html.haml
+++ b/app/views/discussions/_discussion.html.haml
@@ -5,7 +5,7 @@
       = link_to user_path(discussion.author) do
         = image_tag avatar_icon(discussion.author), class: "avatar s40"
     .timeline-content
-      .discussion.js-toggle-container{ class: discussion.id }
+      .discussion.js-toggle-container{ class: discussion.id, data: { discussion_id: discussion.id } }
         .discussion-header
           .discussion-actions
             = link_to "#", class: "note-action-button discussion-toggle-button js-toggle-button" do