diff --git a/src/shared/components/navbar.tsx b/src/shared/components/navbar.tsx
index 877cdd8e..e3c27bd6 100644
--- a/src/shared/components/navbar.tsx
+++ b/src/shared/components/navbar.tsx
@@ -137,8 +137,9 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
     if (searchParam === '') {
       this.context.router.history.push(`/search/`);
     } else {
+      const searchParamEncoded = encodeURIComponent(searchParam);
       this.context.router.history.push(
-        `/search/q/${searchParam}/type/All/sort/TopAll/page/1`
+        `/search/q/${searchParamEncoded}/type/All/sort/TopAll/page/1`
       );
     }
   }
diff --git a/src/shared/components/search.tsx b/src/shared/components/search.tsx
index 0172489f..af6a6b6e 100644
--- a/src/shared/components/search.tsx
+++ b/src/shared/components/search.tsx
@@ -84,7 +84,7 @@ export class Search extends Component<any, SearchState> {
   };
 
   static getSearchQueryFromProps(q: string): string {
-    return q || '';
+    return decodeURIComponent(q) || '';
   }
 
   static getSearchTypeFromProps(type_: string): SearchType {
@@ -504,11 +504,12 @@ export class Search extends Component<any, SearchState> {
 
   updateUrl(paramUpdates: UrlParams) {
     const qStr = paramUpdates.q || this.state.q;
+    const qStrEncoded = encodeURIComponent(qStr);
     const typeStr = paramUpdates.type_ || this.state.type_;
     const sortStr = paramUpdates.sort || this.state.sort;
     const page = paramUpdates.page || this.state.page;
     this.props.history.push(
-      `/search/q/${qStr}/type/${typeStr}/sort/${sortStr}/page/${page}`
+      `/search/q/${qStrEncoded}/type/${typeStr}/sort/${sortStr}/page/${page}`
     );
   }