diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index 2fa48273f0..4817ac2716 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -52,6 +52,8 @@ export const API = createAPIClient({
       return
     }
 
-    window.location = `${updatingUrl}?returnUrl=${encodeURI(window.location)}`
+    window.location = `${updatingUrl}?returnUrl=${encodeURIComponent(
+      window.location
+    )}`
   },
 })