diff --git a/frontend/src/lib/components/apps/components/layout/AppTabs.svelte b/frontend/src/lib/components/apps/components/layout/AppTabs.svelte
index 2e365521a4..14ce061a50 100644
--- a/frontend/src/lib/components/apps/components/layout/AppTabs.svelte
+++ b/frontend/src/lib/components/apps/components/layout/AppTabs.svelte
@@ -104,7 +104,7 @@
 
 {#each disabledTabs ?? [] as disableTab, index}
 	<InputValue
-		key="disable-{index}"
+		key="tabDisabled {index}"
 		{id}
 		input={disableTab}
 		bind:value={resolvedDisabledTabs[index]}
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte
index 3b89208eb5..0b1805eac9 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/GridTab.svelte
@@ -200,7 +200,7 @@
 					</div>
 
 					{#if canDisableTabs && disabledTabs}
-						<GridTabDisabled bind:field={disabledTabs[index]} id={component.id} />
+						<GridTabDisabled {index} bind:field={disabledTabs[index]} id={component.id} />
 					{/if}
 				</div>
 			{/each}
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/GridTabDisabled.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/GridTabDisabled.svelte
index aab13f4188..1494193a4c 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/GridTabDisabled.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/GridTabDisabled.svelte
@@ -6,6 +6,7 @@
 
 	export let id: string
 	export let field: RichConfiguration
+	export let index: number
 
 	let disablable = field && !(field?.type === 'static' && field?.value === false)
 </script>
@@ -37,7 +38,7 @@
 {#if disablable}
 	<div transition:slide|local>
 		<InputsSpecEditor
-			key={`Tab disabled`}
+			key="tabDisabled {index}"
 			bind:componentInput={field}
 			{id}
 			userInputEnabled={false}