diff --git a/src/org/labkey/test/WebDriverWrapper.java b/src/org/labkey/test/WebDriverWrapper.java
index 4df00cfd38..5b38bc7812 100644
--- a/src/org/labkey/test/WebDriverWrapper.java
+++ b/src/org/labkey/test/WebDriverWrapper.java
@@ -22,7 +22,6 @@
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.hc.client5.http.utils.URIUtils;
 import org.eclipse.jetty.util.URIUtil;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.Contract;
@@ -1007,6 +1006,9 @@ public void switchToWindow(int index)
         try
         {
             getDriver().switchTo().window(windows.get(index));
+            new WebDriverWait(getDriver(), Duration.ofSeconds(WAIT_FOR_PAGE))
+                .withMessage("waiting for document to be ready")
+                .until(wd -> Objects.equals(executeScript("return document.readyState;"), "complete"));
         }
         catch (StackOverflowError soe)
         {
@@ -3923,6 +3925,13 @@ public String getUrlParam(String paramName, boolean decode)
         return paramValue;
     }
 
+    /**
+     * Parses the URL query of the current page
+     * @deprecated Duplicated in {@link WebTestHelper#parseUrlQueryString(String)}. Warning: valueless parameters are
+     * handled differently ({@code null} instead of {@code ""})
+     * @return Map of encoded URL parameters
+     */
+    @Deprecated (since = "25.1")
     public Map<String, String> getUrlParameters()
     {
         Map<String, String> params = new HashMap<>();
diff --git a/src/org/labkey/test/pages/reports/ScriptReportPage.java b/src/org/labkey/test/pages/reports/ScriptReportPage.java
index 1466b0dabb..2d57bc293d 100644
--- a/src/org/labkey/test/pages/reports/ScriptReportPage.java
+++ b/src/org/labkey/test/pages/reports/ScriptReportPage.java
@@ -86,7 +86,7 @@ public String saveReport(String name, boolean isSaveAs, int wait)
         {
             saveReportWithName(name, isSaveAs);
         }
-        return getUrlParam("reportId");
+        return getUrlParam("reportId", true);
     }
 
     /**