diff --git a/src/popup/components/App.tsx b/src/popup/components/App.tsx
index 9c68668..9f73fb1 100644
--- a/src/popup/components/App.tsx
+++ b/src/popup/components/App.tsx
@@ -67,7 +67,10 @@ export const App: React.FC = () => {
   );
 
   const handleValueChange = useCallback(
-    (query: string) => setQuery(query),
+    (query: string) => {
+      setQuery(query);
+      setSelectedItemIndex(0);
+    },
     [setQuery]
   );