diff --git a/src/App.vue b/src/App.vue
index 57fddf56d85684ee662a0108f830d41113df95b9..57cdf630969c01dc92f033b4245fe1c8a671e7d5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -102,6 +102,12 @@ function navigate_to_search(self, query) {
   axios.get(self.api_pref + 'search?q=' + query)
   .then(function(response){
     self.search_results = response.data
+    if (! self.search_results.length) {
+      self.article = {
+        lemmas: [],
+        error: "Vi fant ingen resultater for ''" + query + "'. (Søkeforlag kommer i en senere oppatering av Ordbøkene)"
+      }
+    }
     self.waiting_for_articles = false
     history.replaceState({article: self.article, search_results: self.search_results, lang: self.lang}, '')
   })
@@ -130,7 +136,7 @@ export default {
   },
   computed: {
     waiting: function() {
-      return this.waiting_for_articles || this.waiting_for_metadata
+      return (this.waiting_for_articles || this.waiting_for_metadata) && this.$route.name != 'root'
     },
     api_pref: function() {
       return api_endpoint + '/' + this.lang + '/article/'