diff --git a/frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte b/frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte
index 6d50f2d6c..cf42cab3e 100644
--- a/frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte
@@ -27,7 +27,7 @@
 	field="attachment"
 	label={m.attachment()}
 />
-{#if !initialData.requirement_assessments}
+{#if !(initialData.applied_controls || initialData.requirement_assessments)}
 	<AutocompleteSelect
 		{form}
 		options={getOptions({ objects: model.foreignKeys['folder'] })}
@@ -35,6 +35,7 @@
 		cacheLock={cacheLocks['folder']}
 		bind:cachedValue={formDataCache['folder']}
 		label={m.domain()}
+		hidden={initialData.applied_controls || initialData.requirement_assessments}
 	/>
 {:else}
 	<HiddenInput {form} field="folder" />