diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less
--- a/rhodecode/public/css/code-block.less
+++ b/rhodecode/public/css/code-block.less
@@ -717,7 +717,14 @@ input.filediff-collapse-state {
     transform: translate(0, 0); /* For browsers don't support translate3d. */
     transform: translate3d(0, 0, 0);
     will-change: position, transform;
-    height: 60px;
+    height: 70px;
+    z-index: 30;
+    background-color: #fff;
+    padding: 5px 0px;
+}
+
+.sidebar__bar {
+    padding: 5px 0px 0px 0px
 }
 
 .fpath-placeholder {
@@ -728,9 +735,9 @@ input.filediff-collapse-state {
 .is-affixed {
     .sidebar_inner_shadow {
         position: fixed;
-        top: 43px;
-        right: 0;
-        left: 0;
+        top: 75px;
+        right: -100%;
+        left: -100%;
         z-index: 28;
         display: block;
         height: 5px;
diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako
--- a/rhodecode/templates/codeblocks/diffs.mako
+++ b/rhodecode/templates/codeblocks/diffs.mako
@@ -737,7 +737,8 @@ def get_comments_for(diff_type, comments
 
     <div id="diff-file-sticky" class="diffset-menu clearinner">
         ## auto adjustable
-        <div class="sidebar__inner" style="z-index: 30;background-color: #fff; padding: 5px 0px;">
+        <div class="sidebar__inner">
+            <div class="sidebar__bar">
             <div class="pull-right">
             <div class="btn-group">
 
@@ -788,11 +789,12 @@ def get_comments_for(diff_type, comments
                   onclick="updateSticky();return Rhodecode.comments.toggleWideMode(this)">${_('Wide Mode Diff')}</a>
 
           </div>
+            </div>
         </div>
         <div class="fpath-placeholder">
             <i class="icon-file-text"></i>
             <strong class="fpath-placeholder-text">
-
+            Context file:
             </strong>
         </div>
         <div class="sidebar_inner_shadow"></div>
@@ -940,7 +942,7 @@ def get_comments_for(diff_type, comments
                         setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId'))
                     }
                 }, {
-                    offset: 60,
+                    offset: 70,
                     context: '.fpath-placeholder'
                 }
             );
@@ -953,7 +955,7 @@ def get_comments_for(diff_type, comments
                     }
                 }, {
                     offset: function () {
-                        return -this.element.clientHeight + 80
+                        return -this.element.clientHeight + 90
                     },
                     context: '.fpath-placeholder'
                 }