diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 21081a00b..5db007d8d 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -343,7 +343,9 @@ define([
             me.withoutExt = true;
             _.delay(function(){
                 me.setDocTile(name);
+                me.labelDocName.select();
             },100);
+            me.labelDocName.addClass('active-title');
         }
 
         function onDocNameKeyDown(e) {
@@ -727,6 +729,7 @@ define([
                                     me.withoutExt = false;
                                     me.setDocTile(me.documentCaption);
                                 }
+                                me.labelDocName.removeClass('active-title');
                             },
                             'paste': function (e) {
                                 setTimeout(function() {
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index 5bd584d65..9df6d3f5c 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -499,6 +499,15 @@
         background-color: transparent;
         border: 0 none;
         cursor: default;
+
+        &:hover,&.active-title{
+            border: @highlight-header-button-hover solid 2px;
+            border-radius: 3px;
+        }
+        &.active-title{
+            cursor: text;
+        }
+
    }
 
     .lr-separator {
@@ -510,7 +519,7 @@
     .inner-box-icon.crypted {
         width: 20px;
         position: relative;
-
+        margin-right: 1px;
         > svg {
             position: absolute;
             width: 20px;