diff --git a/src/App.vue b/src/App.vue
index e8a983ac9dbcdabf94bb1fce8c48814a58912e07..9f33d03ea8ce786de7641aa9c774bb4f31a82bbc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -146,7 +146,7 @@ export default {
                 return new Promise(resolve => {
                   return axios.get(self.api_pref + 'suggest?q=' + q).then(
                                     function(response) {
-                                        let hits = []
+                                        let hits = q.length ? [{q: q, label: q + ' (fritekstsøk)'}] : []
                                         response.data.forEach((item, i) => {
                                           if (! hits[0] || hits[0].label != item.match) {
                                             hits.splice(0, 0, {q: q, label: item.match, articles: []})
@@ -220,6 +220,9 @@ export default {
       else if(self.$route.name == 'lookup'){
         navigate_to_article(self, self.$route.params.id)
       }
+      else if (self.$route.name == 'search') {
+        navigate_to_search(self, self.$route.query.q)
+      }
       else {
         self.waiting_for_articles = false
         history.replaceState({article: self.article, search_results: self.search_results, lang: self.lang}, '')