diff --git a/packages/components/src/components/code-snippet/_code-snippet.scss b/packages/components/src/components/code-snippet/_code-snippet.scss
index ca43c6f74041..4b749e0dacdd 100644
--- a/packages/components/src/components/code-snippet/_code-snippet.scss
+++ b/packages/components/src/components/code-snippet/_code-snippet.scss
@@ -88,7 +88,6 @@
     .#{$prefix}--copy-btn__feedback {
       @include tooltip--content('icon');
 
-      z-index: z('floating');
       display: none;
       box-sizing: content-box;
       margin: auto;
diff --git a/packages/components/src/components/copy-button/_copy-button.scss b/packages/components/src/components/copy-button/_copy-button.scss
index ed1fa5888c34..8c113acf3577 100644
--- a/packages/components/src/components/copy-button/_copy-button.scss
+++ b/packages/components/src/components/copy-button/_copy-button.scss
@@ -107,7 +107,6 @@
     .#{$prefix}--copy-btn__feedback {
       @include tooltip--content('icon');
 
-      z-index: z('floating');
       display: none;
       box-sizing: content-box;
       margin: auto;
diff --git a/packages/components/src/globals/scss/_tooltip.scss b/packages/components/src/globals/scss/_tooltip.scss
index 4dabb826b393..873b4af2a077 100644
--- a/packages/components/src/globals/scss/_tooltip.scss
+++ b/packages/components/src/globals/scss/_tooltip.scss
@@ -31,6 +31,7 @@
 @mixin tooltip--content($tooltip-type: 'icon') {
   @include box-shadow;
 
+  z-index: z('floating');
   width: max-content;
   min-width: rem(24px);
   max-width: rem(208px);