diff --git a/_build/templates/default/sass/_navbar.scss b/_build/templates/default/sass/_navbar.scss
index 17d705a898..6d5b399eaf 100644
--- a/_build/templates/default/sass/_navbar.scss
+++ b/_build/templates/default/sass/_navbar.scss
@@ -35,7 +35,6 @@
   font-weight: bold;
   font: $fontNavbar;
   height: 100%;
-  z-index: 20;
   display: flex;
   flex-direction: column;
   padding: 0 5px;
@@ -195,7 +194,6 @@
     box-sizing: border-box;
     list-style: none;
     position: absolute;
-    z-index: 99999999999;
     opacity: 0;
     visibility: hidden;
     transition: all .15s ease;
@@ -291,7 +289,6 @@
       background: $white;
       list-style: none;
       position: absolute;
-      z-index: 24;
       &-arrow {
         border: 8px solid transparent;
         border-right-color: #FFF;
@@ -301,7 +298,6 @@
         right: 0;
         top: 50%;
         transform: translate(0, -50%);
-        z-index: 10010;
         display: none;
       }
       &.active {
diff --git a/_build/templates/default/sass/index.scss b/_build/templates/default/sass/index.scss
index 67a987c5d6..3bc334fc8e 100644
--- a/_build/templates/default/sass/index.scss
+++ b/_build/templates/default/sass/index.scss
@@ -198,6 +198,7 @@ textarea.x-form-field {
   width: calc(100% - 370px);
   right: 0;
   left: 370px; /* give #modx-content an initial left value to prevent the panel from jumping around */
+  z-index: 0;
 }
 
 .modx-form p {