diff --git a/src/app/(authenticated)/(dashboard)/[publicId]/settings/developer/components/create-access-token.tsx b/src/app/(authenticated)/(dashboard)/[publicId]/settings/developer/components/create-access-token.tsx
index e2837997a..b4c2793cd 100644
--- a/src/app/(authenticated)/(dashboard)/[publicId]/settings/developer/components/create-access-token.tsx
+++ b/src/app/(authenticated)/(dashboard)/[publicId]/settings/developer/components/create-access-token.tsx
@@ -21,9 +21,14 @@ const CreateAccessToken = () => {
   const createMutation = api.accessToken.create.useMutation({
     onSuccess: ({ token }) => {
       setAccessToken(token);
-      copy(token);
-      toast.success("Access token copied to clipboard.");
+
+      toast.promise(copy(token), {
+        loading: "Copying token...",
+        success: "Access token copied to clipboard.",
+        error: "Error copying token",
+      });
       setOpen(true);
+      setLoading(false);
     },
 
     onError: (error) => {
@@ -33,17 +38,15 @@ const CreateAccessToken = () => {
 
     onSettled: () => {
       setLoading(false);
-      router.refresh();
     },
   });
 
   return (
     <Fragment>
       <Button
-        onClick={(e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
-          e.preventDefault();
+        onClick={async () => {
           setLoading(true);
-          createMutation.mutate({
+          await createMutation.mutateAsync({
             typeEnum: "api",
           });
         }}
@@ -67,6 +70,9 @@ const CreateAccessToken = () => {
           open,
           onOpenChange: (val) => {
             setOpen(val);
+            if (!val) {
+              router.refresh();
+            }
           },
         }}
       >
@@ -75,8 +81,11 @@ const CreateAccessToken = () => {
           <Card
             className="cursor-copy break-words p-3 mt-2"
             onClick={() => {
-              copy(accessToken as string);
-              toast.success("Access token copied to clipboard.");
+              toast.promise(copy(accessToken), {
+                loading: "Copying token...",
+                success: "Access token copied to clipboard.",
+                error: "Error copying token",
+              });
             }}
           >
             <code className="text-sm font-mono text-rose-600">
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 3e899f6a1..e01bc350e 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -42,7 +42,7 @@ export default async function RootLayout({
           <NextAuthProvider session={session}>
             <TRPCReactProvider cookies={cookies().toString()}>
               <main>{children}</main>
-              <Toaster richColors />
+              <Toaster closeButton richColors />
               {nodeEnv === "development" && <ScreenSize />}
             </TRPCReactProvider>
           </NextAuthProvider>