diff --git a/src/org/labkey/test/WebDriverWrapper.java b/src/org/labkey/test/WebDriverWrapper.java
index 38314f6fa6..858a67b383 100644
--- a/src/org/labkey/test/WebDriverWrapper.java
+++ b/src/org/labkey/test/WebDriverWrapper.java
@@ -1235,6 +1235,7 @@ public long beginAt(String url, int millis, boolean acceptAlerts)
             long elapsedTime = doAndWaitForPageToLoad(() -> {
                 try
                 {
+                    mouseOut();
                     getDriver().navigate().to(fullURL);
                 }
                 catch (TimeoutException ex)
@@ -3006,9 +3007,7 @@ public void mouseOut()
         try
         {
             scrollToTop();
-            WebElement root = Locators.documentRoot.findElement(getDriver());
-            final Dimension rootSize = root.getSize();
-            new Actions(getDriver()).moveToElement(root, - (rootSize.getWidth() / 2), - (rootSize.getHeight() / 2)).perform();
+            new Actions(getDriver()).moveToLocation(0, 0).perform();
         }
         catch (WebDriverException ignore) { }
     }
diff --git a/src/org/labkey/test/components/ui/grids/QueryGrid.java b/src/org/labkey/test/components/ui/grids/QueryGrid.java
index 8569b1a8c0..6ede621b9d 100644
--- a/src/org/labkey/test/components/ui/grids/QueryGrid.java
+++ b/src/org/labkey/test/components/ui/grids/QueryGrid.java
@@ -221,6 +221,7 @@ public QueryGrid waitForRecordCount(int expectedCount, int milliseconds)
     @Override
     public void doAndWaitForUpdate(Runnable func)
     {
+        waitForLoaded();
         Optional<WebElement> optionalStatus = elementCache().selectionStatusContainerLoc.findOptionalElement(elementCache());
 
         func.run();
diff --git a/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java b/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
index fe13a937b9..cf643d2d19 100644
--- a/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
+++ b/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
@@ -66,10 +66,10 @@ public WebElement getComponentElement()
     public Boolean isLoaded()
     {
         return getComponentElement().isDisplayed() &&
-                (!Locators.loadingGrid.existsIn(this) &&
+                !Locators.loadingGrid.existsIn(this) &&
                 !Locators.spinner.existsIn(this) &&
-                Locator.tag("td").existsIn(this)) ||
-                getGridEmptyMessage().isPresent();
+            (Locator.tag("td").existsIn(this) ||
+                getGridEmptyMessage().isPresent());
     }
 
     protected void waitForLoaded()
@@ -788,7 +788,7 @@ public Optional<String> getGridEmptyMessage()
 
         try
         {
-            WebElement tr = Locator.tagWithClass("tr", "grid-empty").refindWhenNeeded(this);
+            WebElement tr = Locator.tagWithClass("tr", "grid-empty").findWhenNeeded(this);
             if (tr.isDisplayed())
             {
                 msg = Optional.of(Locator.tag("td").findElement(tr).getText());