diff --git a/.changeset/neat-mangos-promise.md b/.changeset/neat-mangos-promise.md
new file mode 100644
index 000000000..f1db37d6e
--- /dev/null
+++ b/.changeset/neat-mangos-promise.md
@@ -0,0 +1,5 @@
+---
+'@theguild/components': patch
+---
+
+Set .crisp-client z-index to the same one we already have #crisp-chatbox
diff --git a/packages/components/src/server/hive-layout.tsx b/packages/components/src/server/hive-layout.tsx
index 6b5c1c816..40bfe1fb0 100644
--- a/packages/components/src/server/hive-layout.tsx
+++ b/packages/components/src/server/hive-layout.tsx
@@ -97,7 +97,7 @@ export const HiveLayout = async ({
             --nextra-primary-saturation: 40%;
             --nextra-bg: 255, 255, 255;
           }
-          
+
           .x\\:tracking-tight,
           .nextra-steps :is(h2, h3, h4) {
             letter-spacing: normal;
@@ -108,16 +108,16 @@ export const HiveLayout = async ({
             background: #fff;
             color-scheme: light !important;
           }
-          
+
           html:has(body.light) .nextra-search-results mark {
             background: oklch(0.611752 0.07807 214.47 / 0.8);
           }
-          
+
           html:has(body.light) .nextra-sidebar-footer {
             display: none;
           }
-          
-          #crisp-chatbox { z-index: 40 !important; }
+
+          .crisp-client, #crisp-chatbox { z-index: 40 !important; }
         `
         }</style>
         {head}