diff --git a/frontend/src/lib/components/select/SchoolSelect/SchoolSelect.svelte b/frontend/src/lib/components/select/SchoolSelect/SchoolSelect.svelte
index cc77c2c..220fcd8 100644
--- a/frontend/src/lib/components/select/SchoolSelect/SchoolSelect.svelte
+++ b/frontend/src/lib/components/select/SchoolSelect/SchoolSelect.svelte
@@ -76,8 +76,11 @@
 	export let selectedSchool: SchoolType;
 	export let error: string = '';
 
-	$: selectedSchool.name = schoolNameInputValue;
+	schoolFieldInputValue = selectedSchool.field;
+	schoolNameInputValue = selectedSchool.name;
+
 	$: selectedSchool.field = schoolFieldInputValue;
+	$: selectedSchool.name = schoolNameInputValue;
 </script>
 
 <svelte:window on:keydown={navigateList} />