diff --git a/lib/cleanup.php b/lib/cleanup.php
index 0f5c929..e93467b 100644
--- a/lib/cleanup.php
+++ b/lib/cleanup.php
@@ -227,7 +227,7 @@ function roots_nice_search_redirect() {
 
   $search_base = $wp_rewrite->search_base;
   if (is_search() && !is_admin() && strpos($_SERVER['REQUEST_URI'], "/{$search_base}/") === false) {
-    wp_redirect(esc_url(home_url("/{$search_base}/" . urlencode(get_query_var('s')))));
+	  wp_redirect(esc_url_raw(home_url("/{$search_base}/" . get_query_var('s'))));
     exit();
   }
 }