diff --git a/src/components/SearchInput.js b/src/components/SearchInput.js
index 8a8644d6..672e520a 100644
--- a/src/components/SearchInput.js
+++ b/src/components/SearchInput.js
@@ -19,6 +19,20 @@ function SearchInput({ placeholder, value, onChange, ...props }) {
     return () => window.removeEventListener('keydown', handleKeyDown)
   }, [])
 
+  function handleChange(event) {
+    const currentCaret = inputElement.current;
+    const caretPosition = currentCaret.selectionStart; // will Save caret position
+  
+    if (onChange) {
+      onChange(event.target.value); // Update the value
+    }
+  
+    // Restore caret position after value update
+    setTimeout(() => {
+      currentCaret.setSelectionRange(caretPosition, caretPosition);
+    }, 0);
+  }
+
   return (
     <div css={{ position: 'relative' }} {...props}>
       <div
@@ -39,7 +53,7 @@ function SearchInput({ placeholder, value, onChange, ...props }) {
         aria-label="Search"
         placeholder={placeholder}
         value={value}
-        onChange={onChange}
+        onChange={handleChange}
         sx={{
           width: '100%',
           margin: 0,
diff --git a/src/pages/index.js b/src/pages/index.js
index 5b91e4cd..7395fff0 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -74,7 +74,7 @@ function IndexPage({ location }) {
                 Object.keys(icons).length
               } icons (Press "/" to focus)`}
               value={query || ''}
-              onChange={event => setQuery(event.target.value)}
+              onChange={setQuery}
             />
           </div>
           <div sx={{ paddingX: 4 }}>