diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index 64e87878..8a008381 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -36,16 +36,18 @@ watch([results, focused], () => index.value = -1)
 const shift = (delta: number) => index.value = (index.value + delta % results.value.length + results.value.length) % results.value.length
 
 const activate = () => {
-  (document.activeElement as HTMLElement).blur()
   const currentIndex = index.value
   index.value = -1
 
   if (query.value.length === 0)
     return
 
+  (document.activeElement as HTMLElement).blur()
+
   // Disable until search page is implemented
-  // if (currentIndex === -1)
-  //   router.push(`/search?q=${query.value}`)
+  if (currentIndex === -1)
+    // router.push(`/search?q=${query.value}`)
+    return
 
   router.push(results.value[currentIndex].to)
 }
diff --git a/composables/masto/search.ts b/composables/masto/search.ts
index e48f4519..ed98f3ab 100644
--- a/composables/masto/search.ts
+++ b/composables/masto/search.ts
@@ -57,9 +57,7 @@ export function useSearch(query: MaybeRef<string>, options?: UseSearchOptions) {
   }
 
   watch(() => unref(query), () => {
-    if (!unref(query) || !isMastoInitialised.value)
-      return
-    loading.value = true
+    loading.value = !!(unref(query) && isMastoInitialised.value)
   })
 
   debouncedWatch(() => unref(query), async () => {