diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue
index b298ae2449771b08b81aa636541c1949332a7de9..598f48a654f488084f43b370f9bccff1162dcd78 100644
--- a/src/components/Autocomplete.vue
+++ b/src/components/Autocomplete.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="autocomplete-container" :class="$vuetify.breakpoint.name">
-    <v-autocomplete
+    <v-combobox
         v-model="select"
         :loading="loading"
         :items="items"
@@ -19,7 +19,6 @@
         full-width
         flat
         outlined
-        auto-select-first
         placeholder="Søk her"
         ref="autocomplete"
         color="primary"
@@ -28,7 +27,7 @@
       <template v-slot:item="data">
       <span class="search-hit">{{data.item.label}} </span> ({{data.item.lang_set ? Array.from(data.item.lang_set).sort().join(', ') : 'fritekstsøk'}})
       </template>
-    </v-autocomplete>
+    </v-combobox>
   </div>
 </template>
 
@@ -69,7 +68,6 @@
                                   });
                                   hits.reverse()
                                   hits = hits.slice(0, 9)
-                                  hits.unshift({q: encodeURIComponent(q), label: q + ' '})
                                 }
                                 hits.sort( (h1, h2) => {
                                   let val1 = h1.label.length * 10 + (h1.label[0].toLowerCase() === h1.label[0] ? 0 : 1)
@@ -92,7 +90,11 @@
         }
       },
       select(item) {
+        if (typeof item === 'string') {
+          item = {"q": encodeURIComponent(item)}
+        }
         this.$emit('submit', item)
+        this.$refs.autocomplete.blur()
         let self = this
         setTimeout(() => self.$refs.autocomplete.$refs.input.select(), 1)
       }