diff --git a/frontend/src/component/commandBar/CommandBar.tsx b/frontend/src/component/commandBar/CommandBar.tsx
index 46d78e879b..e77f5223dc 100644
--- a/frontend/src/component/commandBar/CommandBar.tsx
+++ b/frontend/src/component/commandBar/CommandBar.tsx
@@ -37,7 +37,7 @@ export const CommandResultsPaper = styled(Paper)(({ theme }) => ({
     width: '100%',
     left: 0,
     top: '39px',
-    zIndex: 4,
+    zIndex: theme.zIndex.drawer,
     borderTop: theme.spacing(0),
     padding: theme.spacing(1.5, 0, 1.5),
     borderRadius: 0,
diff --git a/frontend/src/component/menu/Header/InviteLink/InviteLinkContent.tsx b/frontend/src/component/menu/Header/InviteLink/InviteLinkContent.tsx
index 3831fadd46..d63e34e3b8 100644
--- a/frontend/src/component/menu/Header/InviteLink/InviteLinkContent.tsx
+++ b/frontend/src/component/menu/Header/InviteLink/InviteLinkContent.tsx
@@ -12,7 +12,7 @@ const StyledPaper = styled(Paper)(({ theme }) => ({
     borderRadius: theme.shape.borderRadiusMedium,
     boxShadow: theme.boxShadows.popup,
     position: 'absolute',
-    zIndex: 5000,
+    zIndex: theme.zIndex.snackbar,
     right: -255,
     minWidth: theme.spacing(80),
     [theme.breakpoints.down('md')]: {