diff --git a/src/assets/styles/bmc/custom/_buttons.scss b/src/assets/styles/bmc/custom/_buttons.scss
index 7754f0a..2a7b816 100644
--- a/src/assets/styles/bmc/custom/_buttons.scss
+++ b/src/assets/styles/bmc/custom/_buttons.scss
@@ -71,6 +71,7 @@
   position: absolute;
   right: 0;
   top: 0;
+  z-index: $zindex-dropdown + 1;
 }
 
 // Contain input buttons within input
diff --git a/src/components/Global/TableToolbar.vue b/src/components/Global/TableToolbar.vue
index 4baf836..85c11a4 100644
--- a/src/components/Global/TableToolbar.vue
+++ b/src/components/Global/TableToolbar.vue
@@ -74,12 +74,11 @@
 .toolbar-container {
   width: 100%;
   position: relative;
-  z-index: 5;
+  z-index: $zindex-dropdown + 1;
 }
 
 .toolbar-content {
   height: $toolbar-height;
-  z-index: $zindex-dropdown + 1;
   background-color: theme-color('primary');
   color: $white;
   position: absolute;