diff --git a/apps/dashboard/app/(app)/[workspaceSlug]/apis/[apiId]/_components/create-key/index.tsx b/apps/dashboard/app/(app)/[workspaceSlug]/apis/[apiId]/_components/create-key/index.tsx index 62e515030b..e3c4ace04f 100644 --- a/apps/dashboard/app/(app)/[workspaceSlug]/apis/[apiId]/_components/create-key/index.tsx +++ b/apps/dashboard/app/(app)/[workspaceSlug]/apis/[apiId]/_components/create-key/index.tsx @@ -51,6 +51,7 @@ export const CreateKeyDialog = ({ id: string; name?: string; } | null>(null); + const [dialogKey, setDialogKey] = useState(0); const methods = usePersistedForm( FORM_STORAGE_KEY, @@ -104,11 +105,15 @@ export const CreateKeyDialog = ({ reset(getDefaultValues()); setIsSettingsOpen(false); resetValidSteps(); + // Force dialog to remount and reset to initial state (general section) + setDialogKey((prev) => prev + 1); }); const handleOpenChange = (open: boolean) => { if (!open) { saveCurrentValues(); + // Reset to general step when closing, so next time it opens on the first step + setDialogKey((prev) => prev + 1); } setIsSettingsOpen(open); }; @@ -161,6 +166,7 @@ export const CreateKeyDialog = ({
, }))} onNavigate={handleSectionNavigation} + initialSelectedId="general" /> ({