diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index 22d2b9ed..9f5b5345 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -20,7 +20,4 @@
         - if @comments_allowed
           - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at)
           - unless comments.empty?
-            - comments.each_with_index do |note, i|
-              = render "notes/per_line_note", note: note
-              - @line_notes.reject!{ |n| n == note }
-            = render "notes/per_line_reply_button", line_code: line_code
+            = render "notes/per_line_notes_with_reply", notes: comments
diff --git a/app/views/notes/_per_line_notes_with_reply.html.haml b/app/views/notes/_per_line_notes_with_reply.html.haml
new file mode 100644
index 00000000..1bcfc41f
--- /dev/null
+++ b/app/views/notes/_per_line_notes_with_reply.html.haml
@@ -0,0 +1,3 @@
+- notes.each do |note|
+  = render "notes/per_line_note", note: note
+= render "notes/per_line_reply_button", line_code: notes.first.line_code