src/components/search/search.vue

@@ -56,7 +56,7 @@
     </div>
     <div class="panel-body">
       <div
-        v-if="!Object.values(loading).includes(false) && !hasAtLeastOneResult"
+        v-if="!loadedInitially"
         class="text-center loading-icon"
       >
         <FAIcon

src/components/search_bar/search_bar.js

@@ -10,12 +10,6 @@ library.add(
 )
 
 const SearchBar = {
-  mounted () {
-    window.addEventListener('keydown', this.autoFocus)
-  },
-  beforeDestroy () {
-    window.removeEventListener('keydown', this.autoFocus)
-  },
   data: () => ({
     searchTerm: undefined,
     hidden: true,
@@ -42,36 +36,6 @@ const SearchBar = {
           this.$refs.searchInput.focus()
         }
       })
-    },
-    autoFocus (event) {
-      if (
-        event.target.tagName !== 'BODY' ||
-          event.altKey ||
-          event.ctrlKey ||
-          event.isComposing ||
-          event.metaKey ||
-          event.repeat ||
-          event.shiftKey
-      ) {
-        return
-      }
-
-      if (event.key === '/') {
-        if (this.hidden) {
-          this.toggleHidden()
-        } else {
-          this.$refs.searchInput.focus()
-        }
-        event.preventDefault()
-      } else if (event.key === 'Escape') {
-        if (!this.hidden) {
-          this.toggleHidden()
-        }
-        event.preventDefault()
-      }
-    },
-    blur () {
-      this.$refs.searchInput.blur()
     }
   }
 }

src/components/search_bar/search_bar.vue

@@ -27,9 +27,6 @@
         @keydown.enter="
           $event.isComposing || $event.keyCode === 229 || find(searchTerm)
         "
-        @keydown.escape="
-          $event.isComposing || blur()
-        "
       >
       <button
         class="button-default search-button"