diff --git a/ui/src/style/components/query-builder.scss b/ui/src/style/components/query-builder.scss
index 5a8a0f6313..9f3b916790 100644
--- a/ui/src/style/components/query-builder.scss
+++ b/ui/src/style/components/query-builder.scss
@@ -9,8 +9,6 @@
   display: flex;
   align-items: stretch;
   flex-wrap: nowrap;
-  overflow-x: auto;
-  @include custom-scrollbar($query-builder--list-bg,$c-pool);
 }
 .query-builder--column {
   display: flex;
diff --git a/ui/src/style/components/query-editor.scss b/ui/src/style/components/query-editor.scss
index ae59cbe338..f4cfce0077 100644
--- a/ui/src/style/components/query-editor.scss
+++ b/ui/src/style/components/query-editor.scss
@@ -11,7 +11,7 @@
   border-radius: 0 $radius 0 0;
   background-color: $query-editor--bg;
   position: relative;
-  z-index: 2; /* Minimum amount to obcure the toggle flip within Query Builder. Will fix later */
+  z-index: 3; /* Minimum amount to obcure the toggle flip within Query Builder. Will fix later */
 }
 .query-editor--field {
   font-family: $code-font;
diff --git a/ui/src/style/components/resizer.scss b/ui/src/style/components/resizer.scss
index 0b1d47ef4c..84a60ca6a3 100644
--- a/ui/src/style/components/resizer.scss
+++ b/ui/src/style/components/resizer.scss
@@ -16,7 +16,7 @@ $resizer-color-active: $c-pool;
   margin-top: -$resizer-click-area/2;
   margin-bottom: -$resizer-click-area/2;
   width: 100%;
-  z-index: 2;
+  z-index: 1;
   user-select: none;
   -webkit-user-select: none;
   position: absolute;