Search Box: Handle focus properly

ts/components/CompositionArea.tsx

@@ -317,7 +317,7 @@ export function CompositionArea({
     if (inputApiRef.current) {
       inputApiRef.current.focus();
     }
-  });
+  }, []);
   // Focus input whenever explicitly requested
   useEffect(() => {
     if (focusCounter !== previousFocusCounter && inputApiRef.current) {

ts/state/ducks/search.ts

@@ -339,7 +339,10 @@ export function reducer(
   }
 
   if (action.type === 'SEARCH_CLEAR') {
-    return getEmptyState();
+    return {
+      ...getEmptyState(),
+      startSearchCounter: state.startSearchCounter,
+    };
   }
 
   if (action.type === 'SEARCH_UPDATE') {