diff --git a/frontend/components/form/Searchbox.tsx b/frontend/components/form/Searchbox.tsx
index 649bdd90c..d9219271f 100644
--- a/frontend/components/form/Searchbox.tsx
+++ b/frontend/components/form/Searchbox.tsx
@@ -36,7 +36,7 @@ export default function Searchbox({placeholder, onSearch, delay = 400, defaultVa
         wait:true,
         value
       })
-      onSearch(searchFor)
+      onSearch(encodeURIComponent(searchFor))
     }
     return () => { abort = true }
   },[state,searchFor,onSearch])
diff --git a/frontend/components/search/SearchInput.tsx b/frontend/components/search/SearchInput.tsx
index e325b03a1..c11aae5e2 100644
--- a/frontend/components/search/SearchInput.tsx
+++ b/frontend/components/search/SearchInput.tsx
@@ -44,7 +44,7 @@ export default function SearchInput({
         wait: true,
         value
       })
-      onSearch(searchFor)
+      onSearch(encodeURIComponent(searchFor))
     }
     return () => {
       abort = true