diff --git a/src/components/modal/modal.tsx b/src/components/modal/modal.tsx
index 6221458..f0b602f 100644
--- a/src/components/modal/modal.tsx
+++ b/src/components/modal/modal.tsx
@@ -54,17 +54,17 @@ export function Modal({
     <Portal>
       <AnimatePresence>
         {show && (
-          <>
-            <motion.div
-              animate="show"
-              className={styles.overlay}
-              exit="hidden"
-              initial="hidden"
-              variants={variants.overlay}
-              onClick={onClose}
-              onKeyDown={onClose}
-            />
-            <FocusTrap>
+          <FocusTrap>
+            <div>
+              <motion.div
+                animate="show"
+                className={styles.overlay}
+                exit="hidden"
+                initial="hidden"
+                variants={variants.overlay}
+                onClick={onClose}
+                onKeyDown={onClose}
+              />
               <div className={styles.modal}>
                 <motion.div
                   animate="show"
@@ -80,8 +80,8 @@ export function Modal({
                   {children}
                 </motion.div>
               </div>
-            </FocusTrap>
-          </>
+            </div>
+          </FocusTrap>
         )}
       </AnimatePresence>
     </Portal>
diff --git a/src/components/tooltip/tooltip.module.css b/src/components/tooltip/tooltip.module.css
index f48430d..dcfb49c 100644
--- a/src/components/tooltip/tooltip.module.css
+++ b/src/components/tooltip/tooltip.module.css
@@ -1,4 +1,5 @@
 .tooltip {
+  z-index: 99;
   width: max-content;
   padding: 6px 12px;
   font-size: var(--font-xsm);