diff --git a/frontend/src/lib/components/apps/editor/componentsPanel/ThemeRow.svelte b/frontend/src/lib/components/apps/editor/componentsPanel/ThemeRow.svelte
index f9bb735fe4..e125742c7c 100644
--- a/frontend/src/lib/components/apps/editor/componentsPanel/ThemeRow.svelte
+++ b/frontend/src/lib/components/apps/editor/componentsPanel/ThemeRow.svelte
@@ -59,13 +59,25 @@
 		const theme = await getTheme($workspaceStore!, path)
 
 		await updateTheme($workspaceStore!, DEFAULT_THEME, {
-			value: theme.value
+			value: {
+				value: theme.value ?? '',
+				name: theme.name
+			}
 		})
 
 		await updateTheme($workspaceStore!, path, {
-			value: defaultTheme.value
+			value: {
+				value: defaultTheme.value ?? '',
+				name: defaultTheme.name
+			}
 		})
 
+		stopPreview()
+		$app.theme = {
+			type: 'path',
+			path: DEFAULT_THEME
+		}
+
 		dispatch('reloadThemes')
 	}