diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts
index f49c2eb31..e753bdb16 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.server.ts
@@ -236,11 +236,13 @@ export const actions: Actions = {
 		const scenarioEndpoint = `${BASE_API_URL}/risk-scenarios/${event.params.id}/`;
 		const scenario = await event.fetch(`${scenarioEndpoint}object`).then((res) => res.json());
 
-		const measures = [...scenario.applied_controls, measure.id];
+		const field: string = event.url.searchParams.get('field') || 'applied_controls';
+
+		const measures = [...scenario[field], measure.id];
 
 		const patchRequestInitOptions: RequestInit = {
 			method: 'PATCH',
-			body: JSON.stringify({ applied_controls: measures })
+			body: JSON.stringify({ [field]: measures })
 		};
 
 		const patchRes = await event.fetch(scenarioEndpoint, patchRequestInitOptions);
diff --git a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
index 09fb5a926..c74bb6f4b 100644
--- a/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
@@ -54,12 +54,12 @@
 		}
 	}
 
-	function modalMeasureCreateForm(): void {
+	function modalMeasureCreateForm(field: string): void {
 		const modalComponent: ModalComponent = {
 			ref: CreateModal,
 			props: {
 				form: data.measureCreateForm,
-				formAction: '?/createAppliedControl',
+				formAction: '?/createAppliedControl&field=' + field,
 				model: data.measureModel,
 				debug: false
 			}
@@ -118,281 +118,284 @@
 	const impactColorMap = data.riskMatrix.impact.map((impact) => impact.hexcolor);
 </script>
 
-<div>
-	<SuperForm
-		class="flex flex-col space-y-3"
-		data={data.form}
-		dataType="json"
-		let:form
-		validators={zod(schema)}
-		action="?/updateRiskScenario&next={next}"
-		{...$$restProps}
-	>
-		<div class="flex flex-row space-x-2">
-			<div class="card p-2 bg-white shadow-lg w-1/2">
-				<div class="flex justify-between p-2">
-					<div>
-						<p class="text-sm font-semibold text-gray-400">{m.project()}</p>
-						<Anchor class="anchor text-sm font-semibold" href="/projects/{data.scenario.project.id}"
-							>{data.scenario.project.str}</Anchor
-						>
-					</div>
-					<div>
-						<p class="text-sm font-semibold text-gray-400">{m.riskAssessment()}</p>
-						<Anchor
-							class="anchor text-sm font-semibold"
-							href="/risk-assessments/{data.scenario.risk_assessment.id}"
-							>{data.scenario.risk_assessment.name} {data.scenario.version}</Anchor
-						>
-					</div>
-				</div>
-			</div>
-			<div class="card px-4 py-2 bg-white shadow-lg w-1/2">
-				<div class="flex flex-row justify-between">
-					<div class=" px-2 w-2/3">
-						<AutocompleteSelect
-							{form}
-							multiple
-							options={getOptions({ objects: data.foreignKeys['owner'], label: 'email' })}
-							field="owner"
-							label={m.owner()}
-						/>
-					</div>
-					<div class="w-1/3">
-						<Select
-							class="h-14"
-							{form}
-							options={data.treatmentChoices}
-							field="treatment"
-							label={m.treatmentStatus()}
-						/>
-					</div>
-				</div>
-			</div>
-		</div>
-
-		<div class="flex flex-row space-x-2 min-h-72">
-			<div class="card px-4 py-2 bg-white shadow-lg space-y-4 w-5/12">
-				<span class="flex flex-row space-x-2">
-					<TextField {form} field="ref_id" label={m.refId()} />
-					<TextField {form} field="name" label={m.name()} classesContainer="w-full" />
-				</span>
-				<TextArea {form} field="description" rows={6} label={m.description()} />
-			</div>
-			<div class="card px-4 py-2 bg-white shadow-lg w-7/12 max-h-96 overflow-y-scroll">
-				<AutocompleteSelect
-					multiple
-					{form}
-					options={getOptions({
-						objects: data.foreignKeys['assets'],
-						extra_fields: [['folder', 'str']],
-						label: 'auto'
-					})}
-					field="assets"
-					label={m.assets()}
-					helpText={m.riskScenarioAssetHelpText()}
-				/>
-				<AutocompleteSelect
-					{form}
-					multiple
-					options={getOptions({
-						objects: data.foreignKeys['threats'],
-						extra_fields: [['folder', 'str']],
-						label: 'auto'
-					})}
-					field="threats"
-					label={m.threats()}
-				/>
-				<AutocompleteSelect
-					multiple
-					{form}
-					options={getOptions({
-						objects: data.foreignKeys['vulnerabilities'],
-						extra_fields: [['folder', 'str']],
-						label: 'auto'
-					})}
-					field="vulnerabilities"
-					label={m.vulnerabilities()}
-				/>
-			</div>
-		</div>
-		<input type="hidden" name="urlmodel" value={data.model.urlModel} />
-
-		<div class="card px-4 py-2 bg-white shadow-lg">
-			<h4 class="h4 font-black mb-2">{m.currentRisk()}</h4>
-			<div class="flex flex-row space-x-8 justify-between">
-				<div class="w-1/2">
-					<div class="flex mb-2">
-						<div class="w-full mr-2">
-							<AutocompleteSelect
-								multiple
-								{form}
-								options={getOptions({
-									objects: data.foreignKeys['applied_controls'],
-									extra_fields: [['folder', 'str']]
-								})}
-								field="existing_applied_controls"
-								label={m.existingControls()}
-								helpText={m.existingControlsHelper()}
-							/>
+{#key data.scenario}
+	<div>
+		<SuperForm
+			class="flex flex-col space-y-3"
+			data={data.form}
+			dataType="json"
+			let:form
+			validators={zod(schema)}
+			action="?/updateRiskScenario&next={next}"
+			{...$$restProps}
+		>
+			<div class="flex flex-row space-x-2">
+				<div class="card p-2 bg-white shadow-lg w-1/2">
+					<div class="flex justify-between p-2">
+						<div>
+							<p class="text-sm font-semibold text-gray-400">{m.project()}</p>
+							<Anchor
+								class="anchor text-sm font-semibold"
+								href="/projects/{data.scenario.project.id}">{data.scenario.project.str}</Anchor
+							>
 						</div>
-						<div class="flex items-center justify-center">
-							<div class="">
-								<button
-									class="btn bg-gray-300 h-10 w-10"
-									on:click={modalMeasureCreateForm}
-									type="button"><i class="fa-solid fa-plus text-sm" /></button
-								>
-							</div>
+						<div>
+							<p class="text-sm font-semibold text-gray-400">{m.riskAssessment()}</p>
+							<Anchor
+								class="anchor text-sm font-semibold"
+								href="/risk-assessments/{data.scenario.risk_assessment.id}"
+								>{data.scenario.risk_assessment.name} {data.scenario.version}</Anchor
+							>
 						</div>
 					</div>
-					<TextArea
-						{form}
-						field="existing_controls"
-						label="context"
-						helpText={m.existingContextHelper()}
-						regionContainer="w-1/2"
-						rows={3}
-					/>
 				</div>
-				<div class="flex w-1/2">
-					<div class="flex flex-row space-x-4 my-auto">
-						<div class="min-w-36">
-							<Select
+				<div class="card px-4 py-2 bg-white shadow-lg w-1/2">
+					<div class="flex flex-row justify-between">
+						<div class=" px-2 w-2/3">
+							<AutocompleteSelect
 								{form}
-								options={data.probabilityChoices}
-								color_map={probabilityColorMap}
-								field="current_proba"
-								label={m.currentProba()}
+								multiple
+								options={getOptions({ objects: data.foreignKeys['owner'], label: 'email' })}
+								field="owner"
+								label={m.owner()}
 							/>
 						</div>
-						<i class="fa-solid fa-xmark mt-8" />
-						<div class="min-w-36">
+						<div class="w-1/3">
 							<Select
+								class="h-14"
 								{form}
-								options={data.impactChoices}
-								color_map={impactColorMap}
-								field="current_impact"
-								label={m.currentImpact()}
-							/>
-						</div>
-						<i class="fa-solid fa-equals mt-8" />
-						<div class="min-w-38">
-							<RiskLevel
-								{form}
-								field="current_risk_level"
-								label={m.currentRiskLevel()}
-								riskMatrix={data.riskMatrix}
-								probabilityField="current_proba"
-								impactField="current_impact"
-								helpText={m.currentRiskLevelHelpText()}
+								options={data.treatmentChoices}
+								field="treatment"
+								label={m.treatmentStatus()}
 							/>
 						</div>
 					</div>
 				</div>
 			</div>
-		</div>
 
-		<div class="card px-4 py-2 bg-white shadow-lg">
-			<h4 class="h4 font-black mb-2">{m.residualRisk()}</h4>
-			<div class="flex flex-row space-x-8">
-				<div class="w-1/2">
-					<div class="flex">
-						<div class="w-full mr-2">
-							<AutocompleteSelect
-								multiple
-								{form}
-								options={getOptions({
-									objects: data.foreignKeys['applied_controls'],
-									extra_fields: [['folder', 'str']]
-								})}
-								field="applied_controls"
-								label={m.extraAppliedControls()}
-								helpText={m.extraControlsHelper()}
-							/>
+			<div class="flex flex-row space-x-2 min-h-72">
+				<div class="card px-4 py-2 bg-white shadow-lg space-y-4 w-5/12">
+					<span class="flex flex-row space-x-2">
+						<TextField {form} field="ref_id" label={m.refId()} />
+						<TextField {form} field="name" label={m.name()} classesContainer="w-full" />
+					</span>
+					<TextArea {form} field="description" rows={6} label={m.description()} />
+				</div>
+				<div class="card px-4 py-2 bg-white shadow-lg w-7/12 max-h-96 overflow-y-scroll">
+					<AutocompleteSelect
+						multiple
+						{form}
+						options={getOptions({
+							objects: data.foreignKeys['assets'],
+							extra_fields: [['folder', 'str']],
+							label: 'auto'
+						})}
+						field="assets"
+						label={m.assets()}
+						helpText={m.riskScenarioAssetHelpText()}
+					/>
+					<AutocompleteSelect
+						{form}
+						multiple
+						options={getOptions({
+							objects: data.foreignKeys['threats'],
+							extra_fields: [['folder', 'str']],
+							label: 'auto'
+						})}
+						field="threats"
+						label={m.threats()}
+					/>
+					<AutocompleteSelect
+						multiple
+						{form}
+						options={getOptions({
+							objects: data.foreignKeys['vulnerabilities'],
+							extra_fields: [['folder', 'str']],
+							label: 'auto'
+						})}
+						field="vulnerabilities"
+						label={m.vulnerabilities()}
+					/>
+				</div>
+			</div>
+			<input type="hidden" name="urlmodel" value={data.model.urlModel} />
+
+			<div class="card px-4 py-2 bg-white shadow-lg">
+				<h4 class="h4 font-black mb-2">{m.currentRisk()}</h4>
+				<div class="flex flex-row space-x-8 justify-between">
+					<div class="w-1/2">
+						<div class="flex mb-2">
+							<div class="w-full mr-2">
+								<AutocompleteSelect
+									multiple
+									{form}
+									options={getOptions({
+										objects: data.foreignKeys['applied_controls'],
+										extra_fields: [['folder', 'str']]
+									})}
+									field="existing_applied_controls"
+									label={m.existingControls()}
+									helpText={m.existingControlsHelper()}
+								/>
+							</div>
+							<div class="flex items-center justify-center">
+								<div class="">
+									<button
+										class="btn bg-gray-300 h-10 w-10"
+										on:click={(_) => modalMeasureCreateForm('existing_applied_controls')}
+										type="button"><i class="fa-solid fa-plus text-sm" /></button
+									>
+								</div>
+							</div>
 						</div>
-						<div class="flex items-center justify-center">
-							<div class="">
-								<button
-									class="btn bg-gray-300 h-10 w-10"
-									on:click={modalMeasureCreateForm}
-									type="button"><i class="fa-solid fa-plus text-sm" /></button
-								>
+						<TextArea
+							{form}
+							field="existing_controls"
+							label="context"
+							helpText={m.existingContextHelper()}
+							regionContainer="w-1/2"
+							rows={3}
+						/>
+					</div>
+					<div class="flex w-1/2">
+						<div class="flex flex-row space-x-4 my-auto">
+							<div class="min-w-36">
+								<Select
+									{form}
+									options={data.probabilityChoices}
+									color_map={probabilityColorMap}
+									field="current_proba"
+									label={m.currentProba()}
+								/>
+							</div>
+							<i class="fa-solid fa-xmark mt-8" />
+							<div class="min-w-36">
+								<Select
+									{form}
+									options={data.impactChoices}
+									color_map={impactColorMap}
+									field="current_impact"
+									label={m.currentImpact()}
+								/>
+							</div>
+							<i class="fa-solid fa-equals mt-8" />
+							<div class="min-w-38">
+								<RiskLevel
+									{form}
+									field="current_risk_level"
+									label={m.currentRiskLevel()}
+									riskMatrix={data.riskMatrix}
+									probabilityField="current_proba"
+									impactField="current_impact"
+									helpText={m.currentRiskLevelHelpText()}
+								/>
 							</div>
 						</div>
 					</div>
 				</div>
-				<div class="flex w-1/2">
-					<div class="flex flex-row space-x-4 my-auto">
-						<div class="min-w-36">
-							<Select
-								{form}
-								options={data.probabilityChoices}
-								color_map={probabilityColorMap}
-								field="residual_proba"
-								label={m.residualProba()}
-							/>
-						</div>
-						<i class="fa-solid fa-xmark mt-8" />
-						<div class="min-w-36">
-							<Select
-								{form}
-								options={data.impactChoices}
-								color_map={impactColorMap}
-								field="residual_impact"
-								label={m.residualImpact()}
-							/>
+			</div>
+
+			<div class="card px-4 py-2 bg-white shadow-lg">
+				<h4 class="h4 font-black mb-2">{m.residualRisk()}</h4>
+				<div class="flex flex-row space-x-8">
+					<div class="w-1/2">
+						<div class="flex">
+							<div class="w-full mr-2">
+								<AutocompleteSelect
+									multiple
+									{form}
+									options={getOptions({
+										objects: data.foreignKeys['applied_controls'],
+										extra_fields: [['folder', 'str']]
+									})}
+									field="applied_controls"
+									label={m.extraAppliedControls()}
+									helpText={m.extraControlsHelper()}
+								/>
+							</div>
+							<div class="flex items-center justify-center">
+								<div class="">
+									<button
+										class="btn bg-gray-300 h-10 w-10"
+										on:click={(_) => modalMeasureCreateForm('applied_controls')}
+										type="button"><i class="fa-solid fa-plus text-sm" /></button
+									>
+								</div>
+							</div>
 						</div>
-						<i class="fa-solid fa-equals mt-8" />
-						<div class="min-w-38">
-							<RiskLevel
-								{form}
-								field="current_risk_level"
-								label={m.residualRiskLevel()}
-								riskMatrix={data.riskMatrix}
-								probabilityField="residual_proba"
-								impactField="residual_impact"
-								helpText={m.residualRiskLevelHelpText()}
-							/>
+					</div>
+					<div class="flex w-1/2">
+						<div class="flex flex-row space-x-4 my-auto">
+							<div class="min-w-36">
+								<Select
+									{form}
+									options={data.probabilityChoices}
+									color_map={probabilityColorMap}
+									field="residual_proba"
+									label={m.residualProba()}
+								/>
+							</div>
+							<i class="fa-solid fa-xmark mt-8" />
+							<div class="min-w-36">
+								<Select
+									{form}
+									options={data.impactChoices}
+									color_map={impactColorMap}
+									field="residual_impact"
+									label={m.residualImpact()}
+								/>
+							</div>
+							<i class="fa-solid fa-equals mt-8" />
+							<div class="min-w-38">
+								<RiskLevel
+									{form}
+									field="current_risk_level"
+									label={m.residualRiskLevel()}
+									riskMatrix={data.riskMatrix}
+									probabilityField="residual_proba"
+									impactField="residual_impact"
+									helpText={m.residualRiskLevelHelpText()}
+								/>
+							</div>
 						</div>
 					</div>
 				</div>
 			</div>
-		</div>
 
-		<div class="card px-4 py-2 bg-white shadow-lg">
-			<div class="flex space-x-4 mb-1">
-				<div class="w-1/2">
-					<AutocompleteSelect
-						{form}
-						options={data.qualificationChoices}
-						multiple={true}
-						field="qualifications"
-						label={m.qualification()}
-					/>
-				</div>
-				<div class="w-1/2">
-					<Select
-						{form}
-						options={strengthOfKnowledgeFormChoices}
-						field="strength_of_knowledge"
-						label={m.strengthOfKnowledge()}
-						class="h-14"
-					/>
+			<div class="card px-4 py-2 bg-white shadow-lg">
+				<div class="flex space-x-4 mb-1">
+					<div class="w-1/2">
+						<AutocompleteSelect
+							{form}
+							options={data.qualificationChoices}
+							multiple={true}
+							field="qualifications"
+							label={m.qualification()}
+						/>
+					</div>
+					<div class="w-1/2">
+						<Select
+							{form}
+							options={strengthOfKnowledgeFormChoices}
+							field="strength_of_knowledge"
+							label={m.strengthOfKnowledge()}
+							class="h-14"
+						/>
+					</div>
 				</div>
+				<TextArea {form} field="justification" label={m.justification()} />
+			</div>
+			<div class="flex flex-row justify-between space-x-4">
+				<button
+					class="btn bg-gray-400 text-white font-semibold w-full"
+					data-testid="cancel-button"
+					type="button"
+					on:click={cancel}>{m.cancel()}</button
+				>
+				<button class="btn variant-filled-primary font-semibold w-full" data-testid="save-button"
+					>{m.save()}</button
+				>
 			</div>
-			<TextArea {form} field="justification" label={m.justification()} />
-		</div>
-		<div class="flex flex-row justify-between space-x-4">
-			<button
-				class="btn bg-gray-400 text-white font-semibold w-full"
-				data-testid="cancel-button"
-				type="button"
-				on:click={cancel}>{m.cancel()}</button
-			>
-			<button class="btn variant-filled-primary font-semibold w-full" data-testid="save-button"
-				>{m.save()}</button
-			>
-		</div>
-	</SuperForm>
-</div>
+		</SuperForm>
+	</div>
+{/key}