diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index 112b7ed46..ae8d7f00b 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -1162,6 +1162,18 @@ define([
                 documentHolder.pmiInsFunction.setVisible(iscellmenu||insfunc);
                 documentHolder.pmiAddNamedRange.setVisible(iscellmenu && !iscelledit);
 
+                if (isintable) {
+                    documentHolder.pmiInsertTable.menu.items[0].setDisabled(!formatTableInfo.asc_getIsInsertRowAbove());
+                    documentHolder.pmiInsertTable.menu.items[1].setDisabled(!formatTableInfo.asc_getIsInsertRowBelow());
+                    documentHolder.pmiInsertTable.menu.items[2].setDisabled(!formatTableInfo.asc_getIsInsertColumnLeft());
+                    documentHolder.pmiInsertTable.menu.items[3].setDisabled(!formatTableInfo.asc_getIsInsertColumnRight());
+
+                    documentHolder.pmiDeleteTable.menu.items[0].setDisabled(!formatTableInfo.asc_getIsDeleteRow());
+                    documentHolder.pmiDeleteTable.menu.items[1].setDisabled(!formatTableInfo.asc_getIsDeleteColumn());
+                    documentHolder.pmiDeleteTable.menu.items[2].setDisabled(!formatTableInfo.asc_getIsDeleteTable());
+
+                }
+
                 var hyperinfo = cellinfo.asc_getHyperlink();
                 documentHolder.menuHyperlink.setVisible(iscellmenu && hyperinfo && !iscelledit);
                 documentHolder.menuAddHyperlink.setVisible(iscellmenu && !hyperinfo && !iscelledit);
diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js
index eadd5e5ca..7691b03ad 100644
--- a/apps/spreadsheeteditor/main/app/view/TableSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js
@@ -161,10 +161,16 @@ define([
                 })
             });
             this.btnEdit.render( $('#table-btn-edit')) ;
-            this.btnEdit.menu.on('show:after', _.bind( function(){
+            this.btnEdit.menu.on('show:after', _.bind( function(menu){
                 if (this.api) {
-//                    this.mnuMerge.setDisabled(!this.api.CheckBeforeMergeCells());
-//                    this.mnuSplit.setDisabled(!this.api.CheckBeforeSplitCells());
+                    menu.items[5].setDisabled(!this._originalProps.asc_getIsInsertRowAbove());
+                    menu.items[6].setDisabled(!this._originalProps.asc_getIsInsertRowBelow());
+                    menu.items[7].setDisabled(!this._originalProps.asc_getIsInsertColumnLeft());
+                    menu.items[8].setDisabled(!this._originalProps.asc_getIsInsertColumnRight());
+
+                    menu.items[10].setDisabled(!this._originalProps.asc_getIsDeleteRow());
+                    menu.items[11].setDisabled(!this._originalProps.asc_getIsDeleteColumn());
+                    menu.items[12].setDisabled(!this._originalProps.asc_getIsDeleteTable());
                 }
             }, this));
             this.btnEdit.menu.on('item:click', _.bind(this.onEditClick, this));
@@ -173,7 +179,7 @@ define([
 
         onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) {
             if (this.api)
-                this.api.asc_changeFormatTableInfo(this._state.TableName, type);
+                this.api.asc_changeFormatTableInfo(this._state.TableName, type, newValue=='checked');
             Common.NotificationCenter.trigger('edit:complete', this);
         },