diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 82fa3526d..cca98e9c1 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -207,12 +207,12 @@ define([
             //config.isCrypted =true; //delete fore merge!
             if ( this.labelDocName ) {
                 if ( config.isCrypted ) {
-                    this.labelDocName.attr({'style':'text-align: left;'});
                     this.labelDocName.before(
                         '<div class="inner-box-icon crypted">' +
                             '<svg class="icon"><use xlink:href="#svg-icon-crypted"></use></svg>' +
                         '</div>');
                     this.imgCrypted = this.labelDocName.parent().find('.crypted');
+                    this.titleAlign = 'left';
                 }
 
                 if (!config.isEdit || !config.customization || !config.customization.compactHeader) {
@@ -386,7 +386,9 @@ define([
             if ( e.keyCode == Common.UI.Keys.ESC ) {
                 Common.NotificationCenter.trigger('edit:complete', this);
             } else {
-                me.labelDocName.attr('size', name.length + me.fileExtention.length > 10  ? name.length + me.fileExtention.length : 10);
+                _.delay(function(){
+                    me.setDocTile();
+                },10);
             }
         }
 
@@ -756,10 +758,21 @@ define([
                 return (name.substring(idx) == this.fileExtention) ? name.substring(0, idx) : name ;
             },
             setDocTile: function(name){
-                this.labelDocName.val(name);
-                var ln = this.withoutExt ? this.fileExtention.length : 0;
-                this.labelDocName.attr('size', name.length + ln > 10  ? name.length + ln : 10);
+                if(name)
+                    this.labelDocName.val(name);
+                else
+                    name = this.labelDocName.val();
+                var font ="12.5px Arial, Helvetica, \"Helvetica Neue\", sans-serif";
+                var align = (this.titleAlign)?'text-align: ' +  this.titleAlign + '; margin-left: 1px; ':'';
+                this.labelDocName.attr('style', align + 'width:'+this.getTextWidth(name,font)+'px');
+            },
 
+            getTextWidth: function(text, font) {
+                (!this.canvas) && (this.canvas = document.createElement("canvas"));
+                var ctx = this.canvas.getContext('2d');
+                ctx.font = font;
+                var w = Math.ceil(ctx.measureText(text).width);
+                return (w < 100) ? Math.ceil(w*1.3) : w;
             },
 
             setUserName: function(name) {
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index 7370b2140..4aec0765b 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -487,6 +487,7 @@
         display: flex;
         justify-content: center;
         overflow: hidden;
+        padding: 4px 0px 2px 2px;
     }
 
     #title-doc-name {
@@ -496,7 +497,6 @@
         text-align: center;
         font-size: 12px;
         line-height: 24px;
-        margin: 2px 0;
         background-color: transparent;
         border: 0 none;
         cursor: default;
@@ -506,7 +506,7 @@
             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: 3px;
+            border-radius: 1px;
             cursor: text;
         }