diff --git a/src/lib/features/database/weapons/sections/WeaponGachaSection.svelte b/src/lib/features/database/weapons/sections/WeaponGachaSection.svelte
index 0680f03b..dcec2009 100644
--- a/src/lib/features/database/weapons/sections/WeaponGachaSection.svelte
+++ b/src/lib/features/database/weapons/sections/WeaponGachaSection.svelte
@@ -69,10 +69,12 @@
 					contained
 				/>
 			</DetailItem>
-			<DetailItem label="Recruits" sublabel="Character recruited by this weapon">
+			<DetailItem label="Recruits" sublabel="Character recruited by this weapon" editable={true}>
 				<CharacterTypeahead
 					bind:value={editData.recruits}
+					initialCharacter={weapon.recruits ? { id: weapon.recruits.id, name: weapon.recruits.name?.en || weapon.recruits.granblueId, granblueId: weapon.recruits.granblueId } : null}
 					placeholder="Search for character..."
+					contained
 				/>
 			</DetailItem>
 		{:else}
diff --git a/src/routes/(app)/database/weapons/new/+page.svelte b/src/routes/(app)/database/weapons/new/+page.svelte
index bae297a1..e754c071 100644
--- a/src/routes/(app)/database/weapons/new/+page.svelte
+++ b/src/routes/(app)/database/weapons/new/+page.svelte
@@ -296,8 +296,8 @@
 		</DetailsContainer>
 
 		<DetailsContainer title="Recruits">
-			<DetailItem label="Recruits Character" sublabel="Character recruited by this weapon">
-				<CharacterTypeahead bind:value={editData.recruits} placeholder="Search for character..." />
+			<DetailItem label="Recruits Character" sublabel="Character recruited by this weapon" editable={true}>
+				<CharacterTypeahead bind:value={editData.recruits} placeholder="Search for character..." contained />
 			</DetailItem>
 		</DetailsContainer>