diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index edf8bc231..0d8cb41fb 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -708,7 +708,6 @@ define([
             },
 
             setCanRename: function (rename) {
-                //rename = true;      //comment out for merge
                 var me = this;
                 me.options.canRename = rename;
                 if ( me.labelDocName ) {
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index 92245b52e..75c65040f 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -115,7 +115,7 @@
         cursor: default;
         line-height: 24px;
 
-        &:hover,&:focus {
+        &:hover:not(:disabled),&:focus {
             box-shadow: 0 0 0 1px @highlight-header-button-hover-ie;
             box-shadow: 0 0 0 1px @highlight-header-button-hover;
             border-radius: 1px;
@@ -517,8 +517,6 @@
         &:hover:not(:disabled),&:focus{
             box-shadow: 0 0 0 1px @highlight-header-button-hover-ie;
             box-shadow: 0 0 0 1px @highlight-header-button-hover;
-            /*border:@highlight-header-button-hover-ie solid 1px;
-            border:@highlight-header-button-hover solid 1px;*/
             border-radius: 1px;
             cursor: text;
         }