diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js
index 86c884f08..80f5a65fa 100644
--- a/apps/common/main/lib/component/DataView.js
+++ b/apps/common/main/lib/component/DataView.js
@@ -276,6 +276,7 @@ define([
             me.delayRenderTips = me.options.delayRenderTips || false;
             if (me.parentMenu)
                 me.parentMenu.options.restoreHeight = (me.options.restoreHeight>0);
+            me.delaySelect = me.options.delaySelect || false;
             me.rendered       = false;
             me.dataViewItems = [];
             if (me.options.keyMoveDirection=='vertical')
@@ -396,10 +397,10 @@ define([
                 });
 
                 if (record) {
-                    if (Common.Utils.isSafari) {
+                    if (this.delaySelect) {
                         setTimeout(function () {
                             record.set({selected: true});
-                        }, 200);
+                        }, 300);
                     } else {
                         record.set({selected: true});
                     }
diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js
index 1415c6ed2..21c2587c2 100644
--- a/apps/documenteditor/main/app/controller/LeftMenu.js
+++ b/apps/documenteditor/main/app/controller/LeftMenu.js
@@ -775,6 +775,7 @@ define([
                         this.api.asc_enableKeyEvents(true);
                     } else if (this.leftMenu.btnThumbnails.isActive()) {
                         this.leftMenu.btnThumbnails.toggle(false);
+                        this.leftMenu.panelThumbnails.hide();
                         this.leftMenu.onBtnMenuClick(this.leftMenu.btnThumbnails);
                     }
                 }
diff --git a/apps/documenteditor/main/app/template/LeftMenu.template b/apps/documenteditor/main/app/template/LeftMenu.template
index 27eef5966..ea622cef6 100644
--- a/apps/documenteditor/main/app/template/LeftMenu.template
+++ b/apps/documenteditor/main/app/template/LeftMenu.template
@@ -17,7 +17,7 @@
         <div id="left-panel-chat" class="" style="display: none;"></div>
         <!-- /** coauthoring end **/ -->
         <div id="left-panel-navigation" class="" style="display: none; height: 100%;"></div>
-        <div id="left-panel-plugins" class="" style="display: none; height: 100%;"></div>
         <div id="left-panel-thumbnails" class="" style="display: none; height: 100%;"></div>
+        <div id="left-panel-plugins" class="" style="display: none; height: 100%;"></div>
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js
index d95285e1c..9c04a460e 100644
--- a/apps/documenteditor/main/app/view/ChartSettings.js
+++ b/apps/documenteditor/main/app/view/ChartSettings.js
@@ -276,7 +276,8 @@ define([
                     groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
                     store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>'),
-                    delayRenderTips: true
+                    delayRenderTips: true,
+                    delaySelect: Common.Utils.isSafari
                 });
             });
             this.btnChartType.render($('#chart-button-type'));
diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js
index 69ef3d49f..a6ad60492 100644
--- a/apps/documenteditor/main/app/view/LeftMenu.js
+++ b/apps/documenteditor/main/app/view/LeftMenu.js
@@ -329,6 +329,10 @@ define([
                     this.panelNavigation['hide']();
                     this.btnNavigation.toggle(false, true);
                 }
+                if (this.panelThumbnails) {
+                    this.panelThumbnails['hide']();
+                    this.btnThumbnails.toggle(false, true);
+                }
             }
         },
 
diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less
index b7e06902d..7aeca23cc 100644
--- a/apps/documenteditor/main/resources/less/layout.less
+++ b/apps/documenteditor/main/resources/less/layout.less
@@ -19,8 +19,6 @@ body {
         }
 
         #viewport {
-            overflow: scroll;
-
             &::-webkit-scrollbar {
                 width: 0;
                 height: 0;
diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js
index 9ac998a65..d99b1e1e0 100644
--- a/apps/presentationeditor/main/app/view/ChartSettings.js
+++ b/apps/presentationeditor/main/app/view/ChartSettings.js
@@ -227,7 +227,8 @@ define([
                     groups: new Common.UI.DataViewGroupStore(Common.define.chartData.getChartGroupData()),
                     store: new Common.UI.DataViewStore(Common.define.chartData.getChartData()),
                     itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist"><svg width="40" height="40" class=\"icon\"><use xlink:href=\"#chart-<%= iconCls %>\"></use></svg></div>'),
-                    delayRenderTips: true
+                    delayRenderTips: true,
+                    delaySelect: Common.Utils.isSafari
                 });
             });
             this.btnChartType.render($('#chart-button-type'));
diff --git a/apps/presentationeditor/main/resources/less/layout.less b/apps/presentationeditor/main/resources/less/layout.less
index ececafe9e..6e071fd0c 100644
--- a/apps/presentationeditor/main/resources/less/layout.less
+++ b/apps/presentationeditor/main/resources/less/layout.less
@@ -19,8 +19,6 @@ body {
         }
 
         #viewport {
-            overflow: scroll;
-
             &::-webkit-scrollbar {
                 width: 0;
                 height: 0;
@@ -29,7 +27,6 @@ body {
 
         #viewport-vbox-layout {
             .layout-item:nth-child(3) {
-                overflow: scroll;
 
                 &::-webkit-scrollbar {
                     width: 0;
diff --git a/apps/spreadsheeteditor/main/resources/less/layout.less b/apps/spreadsheeteditor/main/resources/less/layout.less
index 73e06aa0c..b88d75590 100644
--- a/apps/spreadsheeteditor/main/resources/less/layout.less
+++ b/apps/spreadsheeteditor/main/resources/less/layout.less
@@ -13,8 +13,6 @@ body {
         bottom: 0;
 
         #viewport {
-            overflow: auto;
-
             &::-webkit-scrollbar {
                 width: 0;
                 height: 0;