diff --git a/src/assets/javascripts/components2/search/index.ts b/src/assets/javascripts/components2/search/index.ts
index 40c7de5f9..5b9ef47d1 100644
--- a/src/assets/javascripts/components2/search/index.ts
+++ b/src/assets/javascripts/components2/search/index.ts
@@ -80,7 +80,8 @@ export function mountSearch(
       /* Mount search query */
       const query$ = useComponent<HTMLInputElement>("search-query")
         .pipe(
-          mountSearchQuery(handler)
+          mountSearchQuery(handler),
+          shareReplay(1)
         )
 
       /* Mount search reset */
diff --git a/src/assets/javascripts/components2/search/query/index.ts b/src/assets/javascripts/components2/search/query/index.ts
index ee8a17317..2302ef16d 100644
--- a/src/assets/javascripts/components2/search/query/index.ts
+++ b/src/assets/javascripts/components2/search/query/index.ts
@@ -69,7 +69,7 @@ export function mountSearchQuery(
             data: value
           }))
         )
-          .subscribe(tx$)
+          .subscribe(tx$.next.bind(tx$))
 
       /* Toggle search on focus */
       query$
diff --git a/src/assets/javascripts/components2/search/reset/index.ts b/src/assets/javascripts/components2/search/reset/index.ts
index 22525d334..9f027b6cf 100644
--- a/src/assets/javascripts/components2/search/reset/index.ts
+++ b/src/assets/javascripts/components2/search/reset/index.ts
@@ -20,12 +20,13 @@
  * IN THE SOFTWARE.
  */
 
-import { NEVER, OperatorFunction, pipe } from "rxjs"
+import { OperatorFunction, pipe } from "rxjs"
 import {
+  mapTo,
+  startWith,
   switchMap,
   switchMapTo,
-  tap,
-  withLatestFrom
+  tap
 } from "rxjs/operators"
 
 import { watchSearchReset } from "observables"
@@ -41,12 +42,13 @@ import { useComponent } from "../../_"
  *
  * @return Operator function
  */
-export function mountSearchReset(): OperatorFunction<HTMLElement, never> {
+export function mountSearchReset(): OperatorFunction<HTMLElement, void> {
   const query$ = useComponent<HTMLElement>("search-query")
   return pipe(
     switchMap(watchSearchReset),
-    withLatestFrom(query$),
-    tap(([, el]) => el.focus()),
-    switchMapTo(NEVER)
+    switchMapTo(query$),
+    tap(el => el.focus()),
+    mapTo(undefined),
+    startWith(undefined)
   )
 }