diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js
index 671629672..0b2c0ad4a 100644
--- a/apps/common/main/lib/controller/Comments.js
+++ b/apps/common/main/lib/controller/Comments.js
@@ -760,6 +760,7 @@ define([
                     user = usersStore.findWhere({id: userId});
                     if (user) {
                         this.getPopover() && this.getPopover().saveText();
+                        this.view.saveText();
                         cur.set('lock', true);
                         cur.set('lockuserid', this.view.getUserName(user.get('username')));
                     }
@@ -771,6 +772,7 @@ define([
             if (cur) {
                 cur.set('lock', false);
                 this.getPopover() && this.getPopover().loadText();
+                this.view.loadText();
             }
         },
         onApiShowComment: function (uids, posX, posY, leftX, opts, hint) {
diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js
index a63c6538d..95808812b 100644
--- a/apps/common/main/lib/view/Comments.js
+++ b/apps/common/main/lib/view/Comments.js
@@ -183,7 +183,7 @@ define([
                             newHeight = 0;
 
                         function updateTextBoxHeight() {
-                            scrollPos = $(view.scroller.el).scrollTop();
+                            scrollPos = view.scroller.getScrollTop();
 
                             if (domTextBox.scrollHeight > domTextBox.clientHeight) {
                                 textBox.css({height: (domTextBox.scrollHeight + lineHeight) + 'px'});
@@ -841,50 +841,51 @@ define([
         render: function () {
             var me = this;
 
-            this.$el.html(this.template({
-                textAddCommentToDoc: me.textAddCommentToDoc,
-                textAddComment: me.textAddComment,
-                textCancel: me.textCancel,
-                textEnterCommentHint: me.textEnterCommentHint,
-                maxCommLength: Asc.c_oAscMaxCellOrCommentLength
-            }));
+            if (!this.rendered) {
+                this.$el.html(this.template({
+                    textAddCommentToDoc: me.textAddCommentToDoc,
+                    textAddComment: me.textAddComment,
+                    textCancel: me.textCancel,
+                    textEnterCommentHint: me.textEnterCommentHint,
+                    maxCommLength: Asc.c_oAscMaxCellOrCommentLength
+                }));
 
-            this.buttonAddCommentToDoc = new Common.UI.Button({
-                el: $('.btn.new',this.$el),
-                enableToggle: false
-            });
-            this.buttonAdd = new Common.UI.Button({
-                action: 'add',
-                el: $('.btn.add', this.$el),
-                enableToggle: false
-            });
-            this.buttonCancel = new Common.UI.Button({
-                el: $('.btn.cancel', this.$el),
-                enableToggle: false
-            });
+                this.buttonAddCommentToDoc = new Common.UI.Button({
+                    el: $('.btn.new', this.$el),
+                    enableToggle: false
+                });
+                this.buttonAdd = new Common.UI.Button({
+                    action: 'add',
+                    el: $('.btn.add', this.$el),
+                    enableToggle: false
+                });
+                this.buttonCancel = new Common.UI.Button({
+                    el: $('.btn.cancel', this.$el),
+                    enableToggle: false
+                });
 
-            this.buttonAddCommentToDoc.on('click', _.bind(this.onClickShowBoxDocumentComment, this));
-            this.buttonAdd.on('click', _.bind(this.onClickAddDocumentComment, this));
-            this.buttonCancel.on('click', _.bind(this.onClickCancelDocumentComment, this));
+                this.buttonAddCommentToDoc.on('click', _.bind(this.onClickShowBoxDocumentComment, this));
+                this.buttonAdd.on('click', _.bind(this.onClickAddDocumentComment, this));
+                this.buttonCancel.on('click', _.bind(this.onClickCancelDocumentComment, this));
 
-            this.txtComment = $('#comment-msg-new', this.el);
-            this.txtComment.keydown(function (event) {
-                if ((event.ctrlKey || event.metaKey) && !event.altKey && event.keyCode == Common.UI.Keys.RETURN) {
-                    me.onClickAddDocumentComment();
-                    event.stopImmediatePropagation();
-                } else if (event.keyCode === Common.UI.Keys.TAB) {
-                    var $this, end, start;
-                    start = this.selectionStart;
-                    end = this.selectionEnd;
-                    $this = $(this);
-                    $this.val($this.val().substring(0, start) + '\t' + $this.val().substring(end));
-                    this.selectionStart = this.selectionEnd = start + 1;
-
-                    event.stopImmediatePropagation();
-                    event.preventDefault();
-                }
-            });
+                this.txtComment = $('#comment-msg-new', this.el);
+                this.txtComment.keydown(function (event) {
+                    if ((event.ctrlKey || event.metaKey) && !event.altKey && event.keyCode == Common.UI.Keys.RETURN) {
+                        me.onClickAddDocumentComment();
+                        event.stopImmediatePropagation();
+                    } else if (event.keyCode === Common.UI.Keys.TAB) {
+                        var $this, end, start;
+                        start = this.selectionStart;
+                        end = this.selectionEnd;
+                        $this = $(this);
+                        $this.val($this.val().substring(0, start) + '\t' + $this.val().substring(end));
+                        this.selectionStart = this.selectionEnd = start + 1;
 
+                        event.stopImmediatePropagation();
+                        event.preventDefault();
+                    }
+                });
+            }
             var CommentsPanelDataView = Common.UI.DataView.extend((function() {
 
                 var parentView = me;
@@ -983,7 +984,6 @@ define([
             })());
             if (CommentsPanelDataView) {
                 if (this.commentsView) {
-                    this.commentsView.render($('.messages-ct',me.el));
                     this.commentsView.onResetItems();
                 } else {
                     this.commentsView = new CommentsPanelDataView({
@@ -1139,8 +1139,9 @@ define([
                 }
             }
 
-            this.setupLayout();
+            if (!this.rendered) this.setupLayout();
             this.update();
+            this.rendered = true;
 
             return this;
         },
@@ -1204,6 +1205,23 @@ define([
             this.showEditContainer(false);
         },
 
+        saveText: function (clear) {
+            if (this.commentsView && this.commentsView.cmpEl.find('.lock-area').length<1) {
+                this.textVal = undefined;
+                if (!clear) {
+                    this.textVal = this.commentsView.getActiveTextBoxVal();
+                } else {
+                    this.commentsView.clearTextBoxBind();
+                }
+            }
+        },
+        loadText: function () {
+            if (this.textVal && this.commentsView) {
+                var textBox = this.commentsView.getTextBox();
+                textBox && textBox.val(this.textVal);
+            }
+        },
+
         hookTextBox: function () {
             var me = this,
                 textBox = this.commentsView.getTextBox();