diff --git a/backend/core/models.py b/backend/core/models.py
index cfebbe23d0..898246a12a 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -4887,7 +4887,7 @@ class Meta:
     #     risk_matrix = self.risk_assessment.risk_matrix.parse_json()
     #     return [(k, v) for k, v in risk_matrix.fields[field].items()]
 
-    def get_folder_full_path(self, include_root: bool = False) -> list[Folder]:
+    def get_folder_full_path(self, *, include_root: bool = False) -> list[Folder]:
         return self.risk_assessment.get_folder_full_path(include_root=include_root)
 
     @property
diff --git a/backend/iam/models.py b/backend/iam/models.py
index 80e0f26181..d41105dffe 100644
--- a/backend/iam/models.py
+++ b/backend/iam/models.py
@@ -139,7 +139,7 @@ def get_parent_folders(self) -> Generator[Self, None, None]:
         while (current_folder := current_folder.parent_folder) is not None:
             yield current_folder
 
-    def get_folder_full_path(self, include_root: bool = False) -> list[Self]:
+    def get_folder_full_path(self, *, include_root: bool = False) -> list[Self]:
         """
         Get the full path of the folder including its parents.
         If include_root is True, the root folder is included in the path.
@@ -328,7 +328,7 @@ class FolderMixin(models.Model):
         default=Folder.get_root_folder_id,
     )
 
-    def get_folder_full_path(self, include_root: bool = False) -> list[Folder]:
+    def get_folder_full_path(self, *, include_root: bool = False) -> list[Folder]:
         folders = ([self.folder] + [f for f in self.folder.get_parent_folders()])[::-1]
         if include_root:
             return folders
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index 26da9efcc9..511a468ca2 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -93,6 +93,7 @@
 		taintedMessage?: string | boolean;
 		model: ModelInfo;
 		context?: string;
+		origin?: string | null;
 		caching?: boolean;
 		closeModal?: boolean;
 		parent?: any;
@@ -113,6 +114,7 @@
 		taintedMessage = m.taintedFormMessage(),
 		model,
 		context = 'default',
+		origin = null,
 		caching = false,
 		closeModal = false,
 		parent = {},
@@ -374,6 +376,7 @@
 				{cacheLocks}
 				{formDataCache}
 				{schema}
+				{origin}
 				{initialData}
 				{context}
 				{...rest}
diff --git a/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte b/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
index 106078d6f2..7de8258f8e 100644
--- a/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
@@ -25,6 +25,7 @@
 		cacheLocks?: Record<string, CacheLock>;
 		formDataCache?: Record<string, any>;
 		schema?: any;
+		origin?: string | null;
 		initialData?: Record<string, any>;
 		context?: string;
 		rest?: Record<string, any>;
@@ -37,6 +38,7 @@
 		cacheLocks = {},
 		formDataCache = $bindable({}),
 		schema = {},
+		origin = null,
 		initialData = {},
 		context = 'default'
 	}: Props = $props();
@@ -438,10 +440,12 @@
 <AutocompleteSelect
 	{form}
 	optionsEndpoint="folders?content_type=DO&content_type=GL"
+	optionsDetailedUrlParameters={origin === 'requirement-assessments'
+		? [['scope_folder_id', initialData.folder]]
+		: []}
 	field="folder"
 	pathField="path"
 	cacheLock={cacheLocks['folder']}
 	bind:cachedValue={formDataCache['folder']}
 	label={m.domain()}
-	hidden={initialData.folder}
 />
diff --git a/frontend/src/lib/components/Modals/CreateModal.svelte b/frontend/src/lib/components/Modals/CreateModal.svelte
index 5ac14c0075..8d5a1d6664 100644
--- a/frontend/src/lib/components/Modals/CreateModal.svelte
+++ b/frontend/src/lib/components/Modals/CreateModal.svelte
@@ -26,6 +26,7 @@
 		invalidateAll?: boolean; // set to false to keep form data using muliple forms on a page
 		formAction?: string;
 		context?: string;
+		origin?: string | null;
 		additionalInitialData?: any;
 		suggestions?: { [key: string]: any };
 		taintedMessage?: string | boolean;
@@ -43,6 +44,7 @@
 		invalidateAll = true,
 		formAction = '?/create',
 		context = 'create',
+		origin = null,
 		additionalInitialData = {},
 		suggestions = {},
 		taintedMessage = false,
@@ -87,6 +89,7 @@
 			{model}
 			{closeModal}
 			{context}
+			{origin}
 			{duplicate}
 			{taintedMessage}
 			caching={true}
diff --git a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
index 55dc5f5a60..fff2966c3e 100644
--- a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
+++ b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.svelte
@@ -85,6 +85,7 @@
 				model: data.measureModel,
 				debug: false,
 				invalidateAll: false,
+				origin: 'requirement-assessments',
 				suggestions: { reference_control: reference_controls }
 			}
 		};