diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index f8447691d6d0fce796e402404b99c9ff0a80186a..1abedc1f272757f2881c72a54cf66b33453d7a28 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -93,6 +93,7 @@ def new
 
       diff_line_count = Commit::diff_line_count(@diffs)
       @suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count)
+      @force_suppress_diff = @suppress_diff
     end
   end
 
diff --git a/app/views/projects/commits/_diffs.html.haml b/app/views/projects/commits/_diffs.html.haml
index ed95a30bc7e57541cce9c2030184514c5e6f9323..3d7b5974144a2304bbde7742e360e493350c7409 100644
--- a/app/views/projects/commits/_diffs.html.haml
+++ b/app/views/projects/commits/_diffs.html.haml
@@ -11,12 +11,13 @@
           = link_to "plain diff", project_commit_path(@project, @commit, format: :diff), class: "underlined-link"
           or
           = link_to "email patch", project_commit_path(@project, @commit, format: :patch), class: "underlined-link"
+          instead.
         - elsif @merge_request && @merge_request.persisted?
           Please, download the diff as
           = link_to "plain diff", project_merge_request_path(@project, @merge_request, format: :diff), class: "underlined-link"
           or
           = link_to "email patch", project_merge_request_path(@project, @merge_request, format: :patch), class: "underlined-link"
-        instead.
+          instead.
     - unless @force_suppress_diff
       %p
         If you still want to see the diff