diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 18fa15c635..d1dcaf8571 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -2836,7 +2836,7 @@ define([
             me.appConfig = config;
 
             var compactview = !config.isEdit;
-            if ( config.isEdit ) {
+            if ( config.isEdit && !config.isEditDiagram && !config.isEditMailMerge ) {
                 if ( Common.localStorage.itemExists("sse-compact-toolbar") ) {
                     compactview = Common.localStorage.getBool("sse-compact-toolbar");
                 } else
diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
index 06bf8d09db..821b69d031 100644
--- a/apps/spreadsheeteditor/main/app/controller/Viewport.js
+++ b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -101,7 +101,7 @@ define([
                 me.viewport.vlayout.panels[0].height = 40;
             } else
             if ( config.isEditDiagram || config.isEditMailMerge ) {
-                me.viewport.vlayout.panels[0].height = 40;
+                me.viewport.vlayout.panels[0].height = 41;
             }
         },