diff --git a/build/tools/repopick.py b/build/tools/repopick.py
index f255ebbe25..4f7972d88a 100755
--- a/build/tools/repopick.py
+++ b/build/tools/repopick.py
@@ -129,7 +129,7 @@ def build_query_url(remote_url, query, auth):
         },
         doseq=True,
     )
-    return urllib.parse.urlunparse(urllib.parse.ParseResult(**p))
+    return urllib.parse.unquote(urllib.parse.urlunparse(urllib.parse.ParseResult(**p)))
 
 
 def fetch_query_via_http(remote_url, query, auth=True):