diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index f4d3b44dc..5b500ddc2 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -2827,43 +2827,43 @@ define([
 
             setTimeout(function () {
                 me.toolbar.render(_.extend({isCompactView: compactview}, config));
-            }, 0);
 
-            var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
-            var $panel = this.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
-            if ( $panel )
-                me.toolbar.addTab(tab, $panel, 4);
+                var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
+                var $panel = me.application.getController('Common.Controllers.ReviewChanges').createToolbarPanel();
+                if ( $panel )
+                    me.toolbar.addTab(tab, $panel, 4);
 
-            if ( config.isEdit ) {
-                me.toolbar.setMode(config);
+                if ( config.isEdit ) {
+                    me.toolbar.setMode(config);
 
-                me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
+                    me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
 
-                if (!(config.customization && config.customization.compactHeader)) {
-                    // hide 'print' and 'save' buttons group and next separator
-                    me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
+                    if (!(config.customization && config.customization.compactHeader)) {
+                        // hide 'print' and 'save' buttons group and next separator
+                        me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
-                    // hide 'undo' and 'redo' buttons and retrieve parent container
-                    var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
+                        // hide 'undo' and 'redo' buttons and retrieve parent container
+                        var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
 
-                    // move 'paste' button to the container instead of 'undo' and 'redo'
-                    me.toolbar.btnPaste.$el.detach().appendTo($box);
-                    me.toolbar.btnCopy.$el.removeClass('split');
-                }
-
-                if ( config.isDesktopApp ) {
-                    if ( config.canProtect ) {
-                        tab = {action: 'protect', caption: me.toolbar.textTabProtect};
-                        $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
-
-                        if ($panel) me.toolbar.addTab(tab, $panel, 5);
+                        // move 'paste' button to the container instead of 'undo' and 'redo'
+                        me.toolbar.btnPaste.$el.detach().appendTo($box);
+                        me.toolbar.btnCopy.$el.removeClass('split');
                     }
-                }
 
-                var links = me.getApplication().getController('Links');
-                links.setApi(me.api).setConfig({toolbar: me});
-                Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
-            }
+                    if ( config.isDesktopApp ) {
+                        if ( config.canProtect ) {
+                            tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                            $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+
+                            if ($panel) me.toolbar.addTab(tab, $panel, 5);
+                        }
+                    }
+
+                    var links = me.getApplication().getController('Links');
+                    links.setApi(me.api).setConfig({toolbar: me});
+                    Array.prototype.push.apply(me.toolbar.toolbarControls, links.getView('Links').getButtons());
+                }
+            }, 0);
         },
 
         onAppReady: function (config) {
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index db588bf1c..673c6e8bb 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -2082,39 +2082,39 @@ define([
              * */
             setTimeout(function () {
                 me.toolbar.render(_.extend({compactview: compactview}, config));
-            }, 0);
 
-            if ( config.isEdit ) {
-                me.toolbar.setMode(config);
+                if ( config.isEdit ) {
+                    me.toolbar.setMode(config);
 
-                var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
-                var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
-                if ( $panel )
-                    me.toolbar.addTab(tab, $panel, 3);
+                    var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
+                    var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
+                    if ( $panel )
+                        me.toolbar.addTab(tab, $panel, 3);
 
-                me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
+                    me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
 
-                if (!(config.customization && config.customization.compactHeader)) {
-                    // hide 'print' and 'save' buttons group and next separator
-                    me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
+                    if (!(config.customization && config.customization.compactHeader)) {
+                        // hide 'print' and 'save' buttons group and next separator
+                        me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
-                    // hide 'undo' and 'redo' buttons and get container
-                    var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
+                        // hide 'undo' and 'redo' buttons and get container
+                        var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
 
-                    // move 'paste' button to the container instead of 'undo' and 'redo'
-                    me.toolbar.btnPaste.$el.detach().appendTo($box);
-                    me.toolbar.btnCopy.$el.removeClass('split');
-                }
+                        // move 'paste' button to the container instead of 'undo' and 'redo'
+                        me.toolbar.btnPaste.$el.detach().appendTo($box);
+                        me.toolbar.btnCopy.$el.removeClass('split');
+                    }
 
-                if ( config.isDesktopApp ) {
-                    if ( config.canProtect ) { // don't add protect panel to toolbar
-                        tab = {action: 'protect', caption: me.toolbar.textTabProtect};
-                        $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
-                        if ($panel)
-                            me.toolbar.addTab(tab, $panel, 4);
+                    if ( config.isDesktopApp ) {
+                        if ( config.canProtect ) { // don't add protect panel to toolbar
+                            tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                            $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+                            if ($panel)
+                                me.toolbar.addTab(tab, $panel, 4);
+                        }
                     }
                 }
-            }
+            }, 0);
         },
 
         onAppReady: function (config) {
diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 6be96a3dc..031bdf0e9 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -3128,71 +3128,69 @@ define([
             }
 
             setTimeout(function () {
-                Common.Utils.asyncCall(function () {
-                    me.toolbar.render(_.extend({isCompactView: compactview}, config));
-                    if ( config.isEdit ) {
-                        me.toolbar.setMode(config);
+                me.toolbar.render(_.extend({isCompactView: compactview}, config));
+                if ( config.isEdit ) {
+                    me.toolbar.setMode(config);
 
-                        me.toolbar.btnSave && me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
-                        me.toolbar.btnUndo && me.toolbar.btnUndo.on('disabled', _.bind(me.onBtnChangeState, me, 'undo:disabled'));
-                        me.toolbar.btnRedo && me.toolbar.btnRedo.on('disabled', _.bind(me.onBtnChangeState, me, 'redo:disabled'));
-                        me.toolbar.btnPrint && me.toolbar.btnPrint.on('disabled', _.bind(me.onBtnChangeState, me, 'print:disabled'));
-                        me.toolbar.setApi(me.api);
+                    me.toolbar.btnSave && me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled'));
+                    me.toolbar.btnUndo && me.toolbar.btnUndo.on('disabled', _.bind(me.onBtnChangeState, me, 'undo:disabled'));
+                    me.toolbar.btnRedo && me.toolbar.btnRedo.on('disabled', _.bind(me.onBtnChangeState, me, 'redo:disabled'));
+                    me.toolbar.btnPrint && me.toolbar.btnPrint.on('disabled', _.bind(me.onBtnChangeState, me, 'print:disabled'));
+                    me.toolbar.setApi(me.api);
 
-                        if ( !config.isEditDiagram && !config.isEditMailMerge ) {
-                            var datatab = me.getApplication().getController('DataTab');
-                            datatab.setApi(me.api).setConfig({toolbar: me});
+                    if ( !config.isEditDiagram && !config.isEditMailMerge ) {
+                        var datatab = me.getApplication().getController('DataTab');
+                        datatab.setApi(me.api).setConfig({toolbar: me});
 
-                            datatab = datatab.getView('DataTab');
-                            Array.prototype.push.apply(me.toolbar.lockControls, datatab.getButtons());
-                            me.toolbar.btnsSortDown = datatab.getButtons('sort-down');
-                            me.toolbar.btnsSortUp = datatab.getButtons('sort-up');
-                            me.toolbar.btnsSetAutofilter = datatab.getButtons('set-filter');
-                            me.toolbar.btnsClearAutofilter = datatab.getButtons('clear-filter');
+                        datatab = datatab.getView('DataTab');
+                        Array.prototype.push.apply(me.toolbar.lockControls, datatab.getButtons());
+                        me.toolbar.btnsSortDown = datatab.getButtons('sort-down');
+                        me.toolbar.btnsSortUp = datatab.getButtons('sort-up');
+                        me.toolbar.btnsSetAutofilter = datatab.getButtons('set-filter');
+                        me.toolbar.btnsClearAutofilter = datatab.getButtons('clear-filter');
 
-                            var formulatab = me.getApplication().getController('FormulaDialog');
-                            formulatab.setConfig({toolbar: me});
-                            formulatab = formulatab.getView('FormulaTab');
-                            me.toolbar.btnsFormula = formulatab.getButtons('formula');
-                            Array.prototype.push.apply(me.toolbar.lockControls, formulatab.getButtons());
+                        var formulatab = me.getApplication().getController('FormulaDialog');
+                        formulatab.setConfig({toolbar: me});
+                        formulatab = formulatab.getView('FormulaTab');
+                        me.toolbar.btnsFormula = formulatab.getButtons('formula');
+                        Array.prototype.push.apply(me.toolbar.lockControls, formulatab.getButtons());
 
-                            if ( !config.isOffline ) {
-                                tab = {action: 'pivot', caption: me.textPivot};
-                                $panel = me.getApplication().getController('PivotTable').createToolbarPanel();
-                                if ($panel) {
-                                    me.toolbar.addTab(tab, $panel, 5);
-                                    me.toolbar.setVisible('pivot', true);
-                                }
+                        if ( !config.isOffline ) {
+                            tab = {action: 'pivot', caption: me.textPivot};
+                            $panel = me.getApplication().getController('PivotTable').createToolbarPanel();
+                            if ($panel) {
+                                me.toolbar.addTab(tab, $panel, 5);
+                                me.toolbar.setVisible('pivot', true);
                             }
+                        }
 
-                            var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
-                            var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
-                            if ( $panel )
-                                me.toolbar.addTab(tab, $panel, 6);
+                        var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
+                        var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
+                        if ( $panel )
+                            me.toolbar.addTab(tab, $panel, 6);
 
-                            if (!(config.customization && config.customization.compactHeader)) {
-                                // hide 'print' and 'save' buttons group and next separator
-                                me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
+                        if (!(config.customization && config.customization.compactHeader)) {
+                            // hide 'print' and 'save' buttons group and next separator
+                            me.toolbar.btnPrint.$el.parents('.group').hide().next().hide();
 
-                                // hide 'undo' and 'redo' buttons and get container
-                                var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
+                            // hide 'undo' and 'redo' buttons and get container
+                            var $box = me.toolbar.btnUndo.$el.hide().next().hide().parent();
 
-                                // move 'paste' button to the container instead of 'undo' and 'redo'
-                                me.toolbar.btnPaste.$el.detach().appendTo($box);
-                                me.toolbar.btnCopy.$el.removeClass('split');
-                            }
+                            // move 'paste' button to the container instead of 'undo' and 'redo'
+                            me.toolbar.btnPaste.$el.detach().appendTo($box);
+                            me.toolbar.btnCopy.$el.removeClass('split');
+                        }
 
-                            if ( config.isDesktopApp ) {
-                                if ( config.canProtect ) {
-                                    tab = {action: 'protect', caption: me.toolbar.textTabProtect};
-                                    $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
-                                    if ($panel)
-                                        me.toolbar.addTab(tab, $panel, 7);
-                                }
+                        if ( config.isDesktopApp ) {
+                            if ( config.canProtect ) {
+                                tab = {action: 'protect', caption: me.toolbar.textTabProtect};
+                                $panel = me.getApplication().getController('Common.Controllers.Protection').createToolbarPanel();
+                                if ($panel)
+                                    me.toolbar.addTab(tab, $panel, 7);
                             }
                         }
                     }
-                });
+                }
             }, 0);
         },