1 files changed, 8 insertions, 6 deletions

diff --git a/app/assets/javascripts/deprecated_notes.js b/app/assets/javascripts/deprecated_notes.js
index 08177cd0eac..6dbf12054cf 100644
--- a/app/assets/javascripts/deprecated_notes.js
+++ b/app/assets/javascripts/deprecated_notes.js
@@ -515,9 +515,8 @@ export default class Notes {
     }
     if (discussionContainer.length === 0) {
       if (noteEntity.diff_discussion_html) {
-        const discussionElement = document.createElement('table');
+        let discussionElement = document.createElement('table');
         let internalNote;
-        let discussionDOM;
 
         if (!noteEntity.on_image) {
           /*
@@ -536,16 +535,15 @@ export default class Notes {
             Curiously, DOMPurify **ADDS** a totally novel <tbody>, so we're actually
             inserting a completely as-yet-unseen <tbody> element here.
           */
-          discussionDOM = internalNote.querySelector('table').firstChild;
+          discussionElement = internalNote.querySelector('table').querySelector('.notes_holder');
         } else {
           // Image comments don't need <table> manipulation, they're already <div>s
           internalNote = sanitize(noteEntity.diff_discussion_html, {
             RETURN_DOM: true,
           });
-          discussionDOM = internalNote.firstChild;
+          discussionElement.insertAdjacentElement('afterbegin', internalNote.firstElementChild);
         }
 
-        discussionElement.insertAdjacentElement('afterbegin', discussionDOM);
         renderGFM(discussionElement);
         const $discussion = $(discussionElement).unwrap();
 
@@ -1464,7 +1462,11 @@ export default class Notes {
 
     $note.addClass('fade-in-full');
     renderGFM(Notes.getNodeToRender($note));
-    $notesList.append($note);
+    if ($notesList.find('.discussion-reply-holder').length) {
+      $notesList.children('.timeline-entry').last().after($note);
+    } else {
+      $notesList.append($note);
+    }
     return $note;
   }