diff --git a/frontend/src/lib/components/apps/editor/ComponentHeader.svelte b/frontend/src/lib/components/apps/editor/ComponentHeader.svelte
index 499621b452..cc1c04e060 100644
--- a/frontend/src/lib/components/apps/editor/ComponentHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/ComponentHeader.svelte
@@ -56,7 +56,7 @@
 	<div class="top-[-9px] -right-[8px] flex flex-row absolute gap-1.5 z-50">
 		{#if hasInlineEditor}
 			<button
-				title="Expand"
+				title="Edit"
 				class={classNames(
 					'px-1 text-2xs py-0.5 font-bold w-fit border cursor-pointer rounded-sm',
 					'bg-indigo-100 text-indigo-600 border-indigo-500 hover:bg-indigo-200 hover:text-indigo-800'
diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte
index c6356a2678..43c839532c 100644
--- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte
+++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptsPanel.svelte
@@ -39,9 +39,13 @@
 			? findGridItem($app, $selectedComponentInEditor?.split('_')?.[0])
 			: undefined
 
-	$: hiddenInlineScript = $app?.hiddenInlineScripts?.findIndex((k_, index) =>
-		$selectedComponentInEditor?.startsWith(BG_PREFIX + index)
-	)
+	$: hiddenInlineScript = $app?.hiddenInlineScripts?.findIndex((k_, index) => {
+		const [prefix, id] = $selectedComponentInEditor?.split('_') || []
+
+		if (prefix !== 'bg') return false
+
+		return Number(id) === index
+	})
 
 	$: unusedInlineScript = $app?.unusedInlineScripts?.findIndex(
 		(k_, index) => `unused-${index}` === $selectedComponentInEditor