diff --git a/src/containers/Modals/UpgradeModal/index.tsx b/src/containers/Modals/UpgradeModal/index.tsx
index 6ed1a64..cf3026a 100644
--- a/src/containers/Modals/UpgradeModal/index.tsx
+++ b/src/containers/Modals/UpgradeModal/index.tsx
@@ -11,6 +11,7 @@ import {
   AspectRatio,
   Paper,
   CloseButton,
+  FocusTrap,
 } from "@mantine/core";
 import { LuCrown, LuTrendingUp } from "react-icons/lu";
 
@@ -27,6 +28,7 @@ export const UpgradeModal = ({ opened, onClose }: ModalProps) => {
       styles={{ body: { padding: 0 } }}
       overlayProps={{ blur: 1 }}
     >
+      <FocusTrap.InitialFocus />
       <Stack gap="24" px="40" py="20">
         <Flex justify="space-between">
           <Title c="bright" fw="500" fz="24">
@@ -91,7 +93,7 @@ export const UpgradeModal = ({ opened, onClose }: ModalProps) => {
         </Paper>
         <Button
           component="a"
-          href="https://todiagram.com/sign-up?utm_source=jsoncrack&utm_medium=upgrade_modal"
+          href="https://todiagram.com/editor?utm_source=jsoncrack&utm_medium=upgrade_modal"
           target="_blank"
           mb="-16"
           color="green"