diff --git a/CHANGELOG b/CHANGELOG
index caa84707cfb700e104e10abdc6e96c0c3d4ad20b..45a554c3749cf76fb6dfd259775df078cfe9dee2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,7 @@ v 8.13.0 (unreleased)
   - Revert "Label list shows all issues (opened or closed) with that label"
   - Expose expires_at field when sharing project on API
   - Fix VueJS template tags being rendered in code comments
+  - Added copy file path button to merge request diff files
   - Fix issue with page scrolling to top when closing or pinning sidebar (lukehowell)
   - Add Issue Board API support (andrebsguedes)
   - Allow the Koding integration to be configured through the API
diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb
index b478580978bfff79ec8df2190a4b5a3ea5e3599c..a695aceea76c17e01e052f6d0fa4616413c8c4c7 100644
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
@@ -15,10 +15,11 @@ module ButtonHelper
   #
   # See http://clipboardjs.com/#usage
   def clipboard_button(data = {})
+    css_class = data[:class] || 'btn-clipboard'
     data = { toggle: 'tooltip', placement: 'bottom', container: 'body' }.merge(data)
     content_tag :button,
       icon('clipboard'),
-      class: "btn btn-clipboard",
+      class: "btn #{css_class}",
       data: data,
       type: :button,
       title: "Copy to Clipboard"
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index d07de45fdde435e484593ee55c54a928d4d8fc91..257e0a855bd356cb81daa2f5b3f24f02d915152a 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -8,7 +8,7 @@
           = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file", disabled: @diff_notes_disabled do
             = icon('comment')
           \
-
+          = clipboard_button(clipboard_text: diff_file.new_path, class: 'btn-file-option')
           - if editable_diff?(diff_file)
             - link_opts = @merge_request.id ? { from_merge_request_id: @merge_request.id } : {}
             = edit_blob_link(@merge_request.source_project, @merge_request.source_branch, diff_file.new_path,