diff --git a/app/assets/javascripts/diff.js.coffee b/app/assets/javascripts/diff.js.coffee
index 05f5af425716719c6986f6544d006e67956c9f10..069f91c30e1027dc4ccca0cf5d10ad9dc9727db7 100644
--- a/app/assets/javascripts/diff.js.coffee
+++ b/app/assets/javascripts/diff.js.coffee
@@ -37,8 +37,6 @@ class @Diff
       )
     )
 
-    $('.diff-header').stick_in_parent(recalc_every: 1, offset_top: $('.navbar').height())
-
   lineNumbers: (line) ->
     return ([0, 0]) unless line.children().length
     lines = line.children().slice(0, 2)
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index 1747f36dcf3e9ebb9658d79a98219f9a81840650..2b9b6599a7d9c1b052fd565cdcdba1fb79d56498 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -1,10 +1,9 @@
-.row.prepend-top-20.append-bottom-10
-  .col-md-8
-    = render 'projects/diffs/stats', diffs: diffs
-  .col-md-4
-    .btn-group.pull-right
+.prepend-top-20.append-bottom-20
+  .pull-right
+    .btn-group
       = inline_diff_btn
       = parallel_diff_btn
+  = render 'projects/diffs/stats', diffs: diffs
 
 - if show_diff_size_warning?(diffs)
   = render 'projects/diffs/warning', diffs: diffs
@@ -19,3 +18,6 @@
       Failed to collect changes
     %p
       Maybe diff is really big and operation failed with timeout. Try to get diff locally
+
+:coffeescript
+  $('.files .diff-header').stick_in_parent(recalc_every: 1, offset_top: $('.navbar').height())