diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js
index e60e8c364..3e763c838 100644
--- a/apps/documenteditor/main/app/view/ImageSettings.js
+++ b/apps/documenteditor/main/app/view/ImageSettings.js
@@ -360,7 +360,7 @@ define([
                         me.fireEvent('editcomplete', me);
                     }
                     if (e.type !== 'click')
-                        me.btnChangeShape.menu.hide();
+                        me.btnCrop.menu.hide();
                 });
         },
 
diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js
index cacd8c177..cad43e7c9 100644
--- a/apps/presentationeditor/main/app/view/ImageSettings.js
+++ b/apps/presentationeditor/main/app/view/ImageSettings.js
@@ -282,7 +282,7 @@ define([
 
         fillAutoShapes: function() {
             var me = this,
-                recents = Common.localStorage.getItem('de-recent-shapes');
+                recents = Common.localStorage.getItem('pe-recent-shapes');
 
             var menuitem = new Common.UI.MenuItem({
                 template: _.template('<div id="id-img-change-shape-menu" class="menu-insertshape"></div>'),
@@ -302,11 +302,12 @@ define([
             });
             shapePicker.on('item:click', function(picker, item, record, e) {
                 if (me.api) {
+                    PE.getController('Toolbar').toolbar.cmbInsertShape.updateComboView(record);
                     me.api.ChangeShapeType(record.get('data').shapeType);
                     me.fireEvent('editcomplete', me);
                 }
                 if (e.type !== 'click')
-                    me.btnChangeShape.menu.hide();
+                    me.btnCrop.menu.hide();
             });
         },
 
diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js
index a52b05dfb..5fdf7fb1b 100644
--- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js
@@ -372,7 +372,7 @@ define([
 
         fillAutoShapes: function() {
             var me = this,
-                recents = Common.localStorage.getItem('de-recent-shapes');
+                recents = Common.localStorage.getItem('sse-recent-shapes');
 
             var menuitem = new Common.UI.MenuItem({
                 template: _.template('<div id="id-img-change-shape-menu" class="menu-insertshape"></div>'),
@@ -396,7 +396,7 @@ define([
                     Common.NotificationCenter.trigger('edit:complete', me);
                 }
                 if (e.type !== 'click')
-                    me.btnChangeShape.menu.hide();
+                    me.btnCrop.menu.hide();
             });
         },