diff --git a/src/components/datagrid/_data_grid.scss b/src/components/datagrid/_data_grid.scss
index d683f2d2de5..01d1a33461d 100644
--- a/src/components/datagrid/_data_grid.scss
+++ b/src/components/datagrid/_data_grid.scss
@@ -19,7 +19,7 @@
   .euiDataGrid__pagination {
     padding-bottom: $euiSizeXS;
     background: $euiColorLightestShade;
-    border-top: $euiBorderThin;
+    box-shadow: $euiBorderWidthThin 0 0 $euiBorderWidthThin $euiBorderColor; // Use box-shadow instead of border-top to avoid duplicating the border-bottom on grid cells
   }
 }
 
@@ -29,13 +29,14 @@
   max-width: 100%;
   width: 100%;
   overflow: hidden;
-  z-index: 2; // Sits above the pagination below it, but below the controls above it
+  z-index: 1; // Sits below the controls above it and pagination below it
   position: relative;
   background: $euiColorEmptyShade;
   font-feature-settings: 'tnum' 1; // Tabular numbers
 }
 
 .euiDataGrid__pagination {
+  z-index: 2; // Sits above the content above it
   padding-top: $euiSizeXS;
   flex-grow: 0;
 }
diff --git a/src/components/datagrid/controls/_data_grid_toolbar.scss b/src/components/datagrid/controls/_data_grid_toolbar.scss
index c9144561a4f..656c307cfe8 100644
--- a/src/components/datagrid/controls/_data_grid_toolbar.scss
+++ b/src/components/datagrid/controls/_data_grid_toolbar.scss
@@ -1,7 +1,7 @@
 .euiDataGrid__controls {
   background: $euiPageBackgroundColor;
   position: relative;
-  z-index: 3; // Needs to sit above the content blow that sits below it
+  z-index: 2; // Needs to sit above the content below it
   border: $euiBorderThin;
   padding: $euiSizeXS $euiSizeXS $euiSizeXS 0;
   display: flex;