diff --git a/web/src/components/Autocomplete.vue b/web/src/components/Autocomplete.vue
index 6ea961f..e524dfb 100644
--- a/web/src/components/Autocomplete.vue
+++ b/web/src/components/Autocomplete.vue
@@ -51,6 +51,18 @@ export default defineComponent({
                 this.$data.Suggestions = suggestions;
             });
         },
+        keypress(e : KeyboardEvent) {
+            console.log(e.key);
+            if(e.key == "Enter") {
+                const selected = this.$data.Suggestions[0];
+                this.selectElement(selected);
+            }
+        },
+        selectElement(element : Suggestion) {
+            this.$data.Selected = element;
+            this.$data.Suggestions = [];
+            this.$emit('update:modelValue', element);
+        },
         select(e : MouseEvent) {
             const target = (<HTMLInputElement>e.target);
             const valueAttribute = target.attributes.getNamedItem("value");
@@ -58,9 +70,7 @@ export default defineComponent({
             if(valueAttribute != null)
                 selectedID = valueAttribute.value;
             const selected = this.$data.Suggestions.filter(x => x.ID == selectedID)[0];
-            this.$data.Selected = selected;
-            this.$data.Suggestions = [];
-            this.$emit('update:modelValue', selected);
+            this.selectElement(selected);
         },
         clear() {
             this.$data.Selected = undefined;
@@ -72,7 +82,7 @@ export default defineComponent({
 
 <template>
     <div>
-        <input v-if="Selected == undefined" v-model="SearchQuery" />
+        <input @keypress="keypress" v-if="Selected == undefined" v-model="SearchQuery" />
         <span @click="clear" v-if="Selected != undefined" class="bg-gray-300">{{Selected.Name}}</span>
         <div v-if="Suggestions.length > 0" class="absolute bg-gray-400 w-64 p-2">
             <span v-for="suggestion in Suggestions" class="block" @click="select" :value="suggestion.ID">