diff --git a/frontend/src/lib/components/UserSettings.svelte b/frontend/src/lib/components/UserSettings.svelte
index 48f911f226..1c9ff2645b 100644
--- a/frontend/src/lib/components/UserSettings.svelte
+++ b/frontend/src/lib/components/UserSettings.svelte
@@ -21,6 +21,7 @@
 	import DarkModeToggle from './sidebar/DarkModeToggle.svelte'
 	import Toggle from './Toggle.svelte'
 	import type { Writable } from 'svelte/store'
+	import { createEventDispatcher } from 'svelte'
 
 	export let scopes: string[] | undefined = undefined
 	export let newTokenLabel: string | undefined = undefined
@@ -34,6 +35,8 @@
 	let login_type = 'none'
 	let drawer: Drawer
 
+	const dispatch = createEventDispatcher()
+
 	export function openDrawer() {
 		loadLoginType()
 		listTokens()
@@ -78,6 +81,7 @@
 		newToken = await UserService.createToken({
 			requestBody: { label: newTokenLabel, expiration: date?.toISOString(), scopes } as NewToken
 		})
+		dispatch('tokenCreated', newToken)
 		listTokens()
 		displayCreateToken = false
 	}
diff --git a/frontend/src/lib/components/details/WebhooksPanel.svelte b/frontend/src/lib/components/details/WebhooksPanel.svelte
index 0e91f2d9bb..f3499c38d8 100644
--- a/frontend/src/lib/components/details/WebhooksPanel.svelte
+++ b/frontend/src/lib/components/details/WebhooksPanel.svelte
@@ -184,6 +184,9 @@ done`
 
 <UserSettings
 	bind:this={userSettings}
+	on:tokenCreated={(e) => {
+		token = e.detail
+	}}
 	newTokenLabel={`webhook-${generateRandomString(4)}`}
 	{scopes}
 />