diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue
index e718f4c43be59eccacd92e02ce999aaf3d29f08d..906e2adf536bfb23db1cf57f45322649e5a945e2 100644
--- a/src/components/Autocomplete.vue
+++ b/src/components/Autocomplete.vue
@@ -85,31 +85,31 @@
         }
       },
       select(item) {
-        this.items = []
         if (item) {
-          if (typeof item == 'string') { // if blurred without selecting an option
-             // TODO: sett timeout for å vente på siste forslag?
-            item = {q: item, label: item}
-
-          }
-          if (item.q == this.$refs.autocomplete.searchInput) {
-              this.$emit('submit', item)
-              
-              let self = this
-              setTimeout(() => {
-                self.$refs.autocomplete.$refs.input.select()
-                this.items = []
-                this.suggesting = false
-                }, 1)
+          if (typeof item != 'string') {
+            this.$emit('submit', item)
+            
+            let self = this
+            setTimeout(() => {
+              self.$refs.autocomplete.$refs.input.select()
+              this.items = []
+              this.suggesting = false
+              }, 1)
           }
-          
         }
       }
     },
     methods: {
       run_query(q) {
         this.suggesting = true
-        this.items = []
+        if (this.items[0]) {
+          if (this.items[0].lang) {
+          this.items.unshift({q: q, label: q})
+        }
+          else {
+            this.items[0] = {q: q, label: q}
+          }
+        }
         this.debounced(q, this)
       }
     },