diff --git a/frontend/src/lib/components/apps/components/layout/AppConditionalWrapper.svelte b/frontend/src/lib/components/apps/components/layout/AppConditionalWrapper.svelte
index 878f0f719a..0fd383897c 100644
--- a/frontend/src/lib/components/apps/components/layout/AppConditionalWrapper.svelte
+++ b/frontend/src/lib/components/apps/components/layout/AppConditionalWrapper.svelte
@@ -72,20 +72,22 @@
 <InitializeComponent {id} />
 
 <div class="w-full h-full">
-	{#if $app.subgrids?.[`${id}-${selectedConditionIndex}`]}
-		<SubGridEditor
-			visible={render}
-			{id}
-			class={css?.container?.class}
-			style={css?.container?.style}
-			subGridId={`${id}-${selectedConditionIndex}`}
-			containerHeight={componentContainerHeight}
-			on:focus={() => {
-				if (!$connectingInput.opened) {
-					$selectedComponent = [id]
-				}
-				onFocus()
-			}}
-		/>
+	{#if $app.subgrids}
+		{#each resolvedConditions ?? [] as _res, i}
+			<SubGridEditor
+				visible={render && i == selectedConditionIndex}
+				{id}
+				class={css?.container?.class}
+				style={css?.container?.style}
+				subGridId={`${id}-${i}`}
+				containerHeight={componentContainerHeight}
+				on:focus={() => {
+					if (!$connectingInput.opened) {
+						$selectedComponent = [id]
+					}
+					onFocus()
+				}}
+			/>
+		{/each}
 	{/if}
 </div>