diff --git a/src/frontend/src/lib/components/docs/DocForm.svelte b/src/frontend/src/lib/components/docs/DocForm.svelte
index 54de52c08..e596bb2b8 100644
--- a/src/frontend/src/lib/components/docs/DocForm.svelte
+++ b/src/frontend/src/lib/components/docs/DocForm.svelte
@@ -93,7 +93,7 @@
 
 <p class="title doc-form">
 	{#if isActive}
-		{$i18n.document.title_add_new_document}
+		{$i18n.document_form.title_add_new_document}
 	{:else}
 		&ZeroWidthSpace;
 	{/if}
@@ -103,12 +103,12 @@
 	<article class="doc-form" in:fade>
 		<form on:submit|preventDefault={onSubmit}>
 			<Value ref="doc-id">
-				<svelte:fragment slot="label">{$i18n.document.field_doc_id_label}</svelte:fragment>
+				<svelte:fragment slot="label">{$i18n.document_form.field_doc_id_label}</svelte:fragment>
 				<div class="form-doc-id">
 					<input
 						id="doc-id"
 						type="text"
-						placeholder={$i18n.document.field_doc_id_placeholder}
+						placeholder={$i18n.document_form.field_doc_id_placeholder}
 						name="doc_id"
 						bind:value={key}
 					/>
@@ -116,7 +116,7 @@
 						class="text action start"
 						type="button"
 						on:click={() => (key = nanoid())}
-						aria-label={$i18n.document.field_doc_id_btn_auto_id}
+						aria-label={$i18n.document_form.field_doc_id_btn_auto_id}
 					>
 						<IconAutoRenew />
 					</button>
@@ -135,7 +135,7 @@
 
 			<button class="text action start" type="button" on:click={onAddFieldButtonPressed}>
 				<IconNew size="16px" />
-				<span>{$i18n.document.btn_add_field}</span>
+				<span>{$i18n.document_form.btn_add_field}</span>
 			</button>
 
 			<div class="button-wrapper">
diff --git a/src/frontend/src/lib/components/docs/DocFormField.svelte b/src/frontend/src/lib/components/docs/DocFormField.svelte
index 21f8c74d9..f193f86d8 100644
--- a/src/frontend/src/lib/components/docs/DocFormField.svelte
+++ b/src/frontend/src/lib/components/docs/DocFormField.svelte
@@ -16,12 +16,12 @@
 <div class="form-field">
 	<div class="form-field-item">
 		<Value ref="field-name">
-			<svelte:fragment slot="label">{$i18n.document.field_name_label}</svelte:fragment>
+			<svelte:fragment slot="label">{$i18n.document_form.field_name_label}</svelte:fragment>
 			<input
 				id="field-name"
 				name="field-name"
 				type="text"
-				placeholder={$i18n.document.field_name_placeholder}
+				placeholder={$i18n.document_form.field_name_placeholder}
 				bind:value={name}
 			/>
 		</Value>
@@ -29,31 +29,31 @@
 
 	<div class="form-field-item">
 		<Value ref="field-type">
-			<svelte:fragment slot="label">{$i18n.document.field_type_label}</svelte:fragment>
+			<svelte:fragment slot="label">{$i18n.document_form.field_type_label}</svelte:fragment>
 			<select id="field-type" name="field-type" bind:value={fieldType}>
-				<option value={DocFieldTypeEnum.BOOLEAN}>{$i18n.document.field_type_boolean}</option>
-				<option value={DocFieldTypeEnum.STRING}>{$i18n.document.field_type_string}</option>
-				<option value={DocFieldTypeEnum.NUMBER}>{$i18n.document.field_type_number}</option>
+				<option value={DocFieldTypeEnum.BOOLEAN}>{$i18n.document_form.field_type_boolean}</option>
+				<option value={DocFieldTypeEnum.STRING}>{$i18n.document_form.field_type_string}</option>
+				<option value={DocFieldTypeEnum.NUMBER}>{$i18n.document_form.field_type_number}</option>
 			</select>
 		</Value>
 	</div>
 
 	<div class="form-field-item">
 		<Value>
-			<svelte:fragment slot="label">{$i18n.document.field_value_label}</svelte:fragment>
+			<svelte:fragment slot="label">{$i18n.document_form.field_value_label}</svelte:fragment>
 
 			<div class="value-input-wrapper">
 				{#if fieldType === DocFieldTypeEnum.NUMBER || fieldType === DocFieldTypeEnum.STRING}
 					<input
 						type={fieldType === DocFieldTypeEnum.STRING ? 'text' : 'number'}
-						placeholder={$i18n.document.field_value_label}
+						placeholder={$i18n.document_form.field_value_label}
 					/>
 				{/if}
 
 				{#if fieldType === DocFieldTypeEnum.BOOLEAN}
 					<select bind:value>
-						<option value={true}>{$i18n.document.field_value_true}</option>
-						<option value={false}>{$i18n.document.field_value_false}</option>
+						<option value={true}>{$i18n.document_form.field_value_true}</option>
+						<option value={false}>{$i18n.document_form.field_value_false}</option>
 					</select>
 				{/if}
 
diff --git a/src/frontend/src/lib/components/docs/Docs.svelte b/src/frontend/src/lib/components/docs/Docs.svelte
index 64fba8584..dd33360fe 100644
--- a/src/frontend/src/lib/components/docs/Docs.svelte
+++ b/src/frontend/src/lib/components/docs/Docs.svelte
@@ -107,7 +107,7 @@
 				<button
 					class="text action start"
 					on:click={() => docsStore.set({ key: undefined, data: undefined, action: 'create' })}
-					><IconNew size="16px" /> <span>{$i18n.document.btn_add_document}</span></button
+					><IconNew size="16px" /> <span>{$i18n.document_form.btn_add_document}</span></button
 				>
 			{/if}
 
diff --git a/src/frontend/src/lib/i18n/en.json b/src/frontend/src/lib/i18n/en.json
index e9d06e979..f0311fba2 100644
--- a/src/frontend/src/lib/i18n/en.json
+++ b/src/frontend/src/lib/i18n/en.json
@@ -266,7 +266,9 @@
 		"delete": "Delete document?",
 		"description": "Description",
 		"document_submission_success": "Document has been successfully submitted!",
-		"document_submission_failed": "Document submission failed!",
+		"document_submission_failed": "Document submission failed!"
+	},
+	"document_form": {
 		"field_doc_id_label": "Doc ID",
 		"field_doc_id_btn_auto_id": "Auto ID",
 		"field_doc_id_placeholder": "Document ID",
diff --git a/src/frontend/src/lib/i18n/it.json b/src/frontend/src/lib/i18n/it.json
index dd651a9f0..a6426ea35 100644
--- a/src/frontend/src/lib/i18n/it.json
+++ b/src/frontend/src/lib/i18n/it.json
@@ -266,7 +266,9 @@
 		"delete": "Vuoi eliminare il documento?",
 		"description": "Descrizione",
 		"document_submission_success": "Il documento è stato inviato con successo!",
-		"document_submission_failed": "Invio del documento non riuscito!",
+		"document_submission_failed": "Invio del documento non riuscito!"
+	},
+	"document_form": {
 		"field_doc_id_label": "Doc ID",
 		"field_doc_id_btn_auto_id": "Auto ID",
 		"field_doc_id_placeholder": "ID documento",
diff --git a/src/frontend/src/lib/i18n/zh-cn.json b/src/frontend/src/lib/i18n/zh-cn.json
index dd726945e..6bef1b172 100644
--- a/src/frontend/src/lib/i18n/zh-cn.json
+++ b/src/frontend/src/lib/i18n/zh-cn.json
@@ -266,7 +266,9 @@
 		"delete": "删除文档?",
 		"description": "描述",
 		"document_submission_success": "文件已成功提交！",
-		"document_submission_failed": "文件提交失败！",
+		"document_submission_failed": "文件提交失败！"
+	},
+	"document_form": {
 		"field_doc_id_label": "Doc ID",
 		"field_doc_id_btn_auto_id": "Auto ID",
 		"field_doc_id_placeholder": "文件编号",
diff --git a/src/frontend/src/lib/types/i18n.d.ts b/src/frontend/src/lib/types/i18n.d.ts
index 7bb6c9175..84fefbddb 100644
--- a/src/frontend/src/lib/types/i18n.d.ts
+++ b/src/frontend/src/lib/types/i18n.d.ts
@@ -283,6 +283,9 @@ interface I18nDocument {
 	description: string;
 	document_submission_success: string;
 	document_submission_failed: string;
+}
+
+interface I18nDocument_form {
 	field_doc_id_label: string;
 	field_doc_id_btn_auto_id: string;
 	field_doc_id_placeholder: string;
@@ -483,6 +486,7 @@ interface I18n {
 	cli: I18nCli;
 	errors: I18nErrors;
 	document: I18nDocument;
+	document_form: I18nDocument_form;
 	asset: I18nAsset;
 	admin: I18nAdmin;
 	controllers: I18nControllers;