diff --git a/easy-ui-react/src/ForgeLayout/ForgeLayoutControls.module.scss b/easy-ui-react/src/ForgeLayout/ForgeLayoutControls.module.scss
index 2b32daeb..108db44e 100644
--- a/easy-ui-react/src/ForgeLayout/ForgeLayoutControls.module.scss
+++ b/easy-ui-react/src/ForgeLayout/ForgeLayoutControls.module.scss
@@ -13,7 +13,7 @@
     theme-token("color.neutral.300");
   margin-right: design-token("space.3");
   display: inline-flex;
-  z-index: 1;
+  z-index: design-token("z-index.nav");
 }
 
 .backButtonContainer {
@@ -52,7 +52,7 @@
   cursor: pointer;
   width: 100%;
   max-width: 133px;
-  z-index: 1;
+  z-index: design-token("z-index.nav");
 }
 
 .triggerPopoverOpen {