diff --git a/src/core/public/chrome/ui/header/_index.scss b/src/core/public/chrome/ui/header/_index.scss
index f19728a52dd70bd..1ab1885fe01d28c 100644
--- a/src/core/public/chrome/ui/header/_index.scss
+++ b/src/core/public/chrome/ui/header/_index.scss
@@ -8,6 +8,10 @@
   z-index: 10;
 }
 
+.euiDataGrid__restrictBody .chrHeaderWrapper {
+  z-index: 0;
+}
+
 .chrHeaderWrapper ~ .app-wrapper:not(.hidden-chrome) {
   top: $euiHeaderChildSize;
   left: $euiHeaderChildSize;
diff --git a/src/legacy/core_plugins/kibana/public/discover/_discover.scss b/src/legacy/core_plugins/kibana/public/discover/_discover.scss
index e823e543fbafef8..534c95f460d71f5 100644
--- a/src/legacy/core_plugins/kibana/public/discover/_discover.scss
+++ b/src/legacy/core_plugins/kibana/public/discover/_discover.scss
@@ -28,11 +28,9 @@ discover-app {
   padding-right: $euiSizeS;
 }
 
-// SASSTODO: replace the z-index value with a variable
 .dscWrapper {
   padding-right: $euiSizeS;
   padding-left: 21px;
-  z-index: 1;
 }
 
 @include euiPanel('.dscWrapper__content');
diff --git a/src/legacy/ui/public/collapsible_sidebar/_collapsible_sidebar.scss b/src/legacy/ui/public/collapsible_sidebar/_collapsible_sidebar.scss
index 68594cbe538cfca..5840ebc92578c7d 100644
--- a/src/legacy/ui/public/collapsible_sidebar/_collapsible_sidebar.scss
+++ b/src/legacy/ui/public/collapsible_sidebar/_collapsible_sidebar.scss
@@ -1,15 +1,12 @@
 // SASSTODO: Can't rename main class
 // because it's also the name of the angular directive
 .collapsible-sidebar {
-  position: relative;
-  z-index: $kbnDiscoverSidebarDepth;
-
   .kbnCollapsibleSidebar__collapseButton {
     position: absolute;
     top: 0;
     right: -21px;
     cursor: pointer;
-    z-index: -1;
+    z-index: 1;
   }
 
   &.closed {
@@ -25,12 +22,16 @@
       visibility: visible;
 
       .chevron-cont:before {
-        content: "\F138";
+        content: '\F138';
       }
     }
   }
 }
 
+.visEditor__content .collapsible-sidebar {
+  position: relative;
+}
+
 @include euiBreakpoint('xs', 's', 'm') {
   .collapsible-sidebar {
     &.closed {