diff --git a/src/lib/components/PopUpDialog/popUpDialog.scss b/src/lib/components/PopUpDialog/popUpDialog.scss
index 9f4489f9..6ecb1591 100644
--- a/src/lib/components/PopUpDialog/popUpDialog.scss
+++ b/src/lib/components/PopUpDialog/popUpDialog.scss
@@ -19,13 +19,13 @@
     position: fixed;
     top: 0;
     left: 0;
-    z-index: 6;
     display: flex;
     align-items: center;
     justify-content: center;
     width: 100%;
     height: 100%;
     background: $mineshaftTwo;
+    z-index: 999;
 
     &.custom-position {
       width: auto;
diff --git a/src/lib/components/Tooltip/tooltip.scss b/src/lib/components/Tooltip/tooltip.scss
index dc32fe47..78f2eb18 100644
--- a/src/lib/components/Tooltip/tooltip.scss
+++ b/src/lib/components/Tooltip/tooltip.scss
@@ -5,5 +5,5 @@
   line-height: 1.4;
   display: flex;
   max-width: 400px;
-  z-index: 7;
+  z-index: 999;
 }