diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js
index d3f8180c63..df3beca78e 100644
--- a/apps/documenteditor/main/app/view/ShapeSettings.js
+++ b/apps/documenteditor/main/app/view/ShapeSettings.js
@@ -1687,7 +1687,6 @@ define([
                         {caption: this.textEditPoints, value: 0, iconCls: 'toolbar__icon select-all'},
                         {
                             caption: this.strChange,
-                            value: 1,
                             menu        : new Common.UI.Menu({
                                 menuAlign: 'tl-tl',
                                 cls: 'menu-shapes menu-change-shape',
@@ -1924,8 +1923,10 @@ define([
                     me.api.ChangeShapeType(record.get('data').shapeType);
                     me.fireEvent('editcomplete', me);
                 }
-                if (e.type !== 'click')
-                    me.btnChangeShape.menu.hide();
+                if (e.type !== 'click') {
+                    var menu = me.canEditPoint ? me.btnEditShape.menu : me.btnEditChangeShape.menu;
+                    menu.hide();
+                }
             });
         },
 
diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js
index 42f5eec101..501db789df 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettings.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettings.js
@@ -1504,7 +1504,6 @@ define([
                         {caption: this.textEditPoints, value: 0, iconCls: 'toolbar__icon select-all'},
                         {
                             caption: this.strChange,
-                            value: 1,
                             menu        : new Common.UI.Menu({
                                 menuAlign: 'tl-tl',
                                 cls: 'menu-shapes menu-change-shape',
@@ -1761,8 +1760,10 @@ define([
                     me.api.ChangeShapeType(record.get('data').shapeType);
                     me.fireEvent('editcomplete', me);
                 }
-                if (e.type !== 'click')
-                    me.btnChangeShape.menu.hide();
+                if (e.type !== 'click') {
+                    var menu = me.canEditPoint ? me.btnEditShape.menu : me.btnEditChangeShape.menu;
+                    menu.hide();
+                }
             });
         },
 
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
index 8060c5720e..b01ce2adaa 100644
--- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js
@@ -1519,7 +1519,6 @@ define([
                         {caption: this.textEditPoints, value: 0, iconCls: 'toolbar__icon select-all'},
                         {
                             caption: this.strChange,
-                            value: 1,
                             menu        : new Common.UI.Menu({
                                 menuAlign: 'tl-tl',
                                 cls: 'menu-shapes menu-change-shape',
@@ -1767,8 +1766,10 @@ define([
                     me.api.asc_changeShapeType(record.get('data').shapeType);
                     Common.NotificationCenter.trigger('edit:complete', me);
                 }
-                if (e.type !== 'click')
-                    me.btnChangeShape.menu.hide();
+                if (e.type !== 'click'){
+                    var menu = me.canEditPoint ? me.btnEditShape.menu : me.btnEditChangeShape.menu;
+                    menu.hide();
+                }
             });
         },