diff --git a/src/App.vue b/src/App.vue
index 6df5e4a..3e4437c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,10 +30,6 @@
 		currentWorkingInstrument.value = instruments.value.find(instrument => instrument.name === currentWorkingCategory.value.instrument)
 	}
 	onMounted(loadData)
-
-	watch(currentWorkingInstrument, () => {
-		currentWorkingCategory.value = categories.value.find(category => category.instrument === currentWorkingInstrument.value.name)
-	})
 </script>
 
 <template>
diff --git a/src/components/category_chooser.vue b/src/components/category_chooser.vue
index 25c908a..5c232f1 100644
--- a/src/components/category_chooser.vue
+++ b/src/components/category_chooser.vue
@@ -2,9 +2,14 @@
 	const props = defineProps(['instruments', 'categories'])
 	const currentWorkingCategory = defineModel('currentWorkingCategory')
 	const currentWorkingInstrument = defineModel('currentWorkingInstrument')
+ 	
+	const selectFirstInstrumentOfCategory = () => {
+		currentWorkingCategory.value = props.categories.find(category => category.instrument === currentWorkingInstrument.value.name)
+	}
+
 </script>
 <template>
-	<select v-model="currentWorkingInstrument">
+	<select @change="selectFirstInstrumentOfCategory" v-model="currentWorkingInstrument">
 		<option :value="instrument" v-for="instrument in props.instruments">
 			{{instrument.name}}
 		</option>