diff --git a/src/styles/color-switcher.scss b/src/styles/color-switcher.scss
index 9e6fb70599d..86428dfff31 100644
--- a/src/styles/color-switcher.scss
+++ b/src/styles/color-switcher.scss
@@ -23,10 +23,11 @@
     &:hover {
       background-color: var(--amplify-colors-primary-10);
     }
-  }
-  .amplify-togglebutton--pressed {
-    color: var(--amplify-colors-font-primary);
-    border-color: var(--amplify-colors-neutral-100);
-    background-color: var(--amplify-colors-primary-10);
+    &.amplify-togglebutton--pressed {
+      color: var(--amplify-colors-font-primary);
+      border-color: var(--amplify-colors-neutral-100);
+      background-color: var(--amplify-colors-primary-10);
+      z-index: 1;
+    }
   }
 }
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index e992100a51d..9fef1ea979f 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -136,7 +136,7 @@
   position: fixed;
   top: 0;
   width: 100%;
-  z-index: 1;
+  z-index: 2;
 }
 
 @keyframes menu {