diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js
index e758e4047..4918b9ba7 100644
--- a/apps/documenteditor/main/app/view/TableSettings.js
+++ b/apps/documenteditor/main/app/view/TableSettings.js
@@ -430,7 +430,7 @@ define([
             if (this._initSettings)
                 this.createDelayedElements();
 
-            this.disableControls(this._locked);
+            var updateState = this.disableControls(this._locked); // need to update combodataview after disabled state
 
             if (props )
             {
@@ -451,7 +451,7 @@ define([
 
                 //for table-template
                 value = props.get_TableStyle();
-                if (this._state.TemplateId!==value || this._isTemplatesChanged) {
+                if (this._state.TemplateId!==value || this._isTemplatesChanged || updateState) {
                     this.cmbTableTemplate.suspendEvents();
                     var rec = this.cmbTableTemplate.menuPicker.store.findWhere({
                         templateId: value
@@ -773,6 +773,7 @@ define([
                     item.setDisabled(disable);
                 });
                 this.linkAdvanced.toggleClass('disabled', disable);
+                return !disable;
             }
         },