diff --git a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java b/src/org/labkey/test/components/ui/grids/DetailTableEdit.java
index f153ac42df..7bf5e6204c 100644
--- a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java
+++ b/src/org/labkey/test/components/ui/grids/DetailTableEdit.java
@@ -543,6 +543,7 @@ public DetailDataPanel clickCancel()
     {
         String title = getSourceTitle();
         elementCache().cancelButton.click();
+        getWrapper().shortWait().until(ExpectedConditions.stalenessOf(elementCache().cancelButton));
         return new DetailDataPanel.DetailDataPanelFinder(getDriver()).withTitle(title).waitFor();
     }
 
diff --git a/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java b/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java
index 1ea7e3216d..55b727db29 100644
--- a/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java
+++ b/src/org/labkey/test/components/ui/notifications/ServerNotificationMenu.java
@@ -158,9 +158,9 @@ public void clickMarkAll()
     public ImportsPage clickViewAll()
     {
         expand();
-        WebDriverWrapper.waitFor(elementCache().viewAllLink::isDisplayed,
+        WebDriverWrapper.waitFor(elementCache().viewAllLink()::isDisplayed,
                 "View all link did not become visible.", 2_500);
-        elementCache().viewAllLink.click();
+        elementCache().viewAllLink().click();
         return new ImportsPage(getWrapper());
     }
 
@@ -278,7 +278,10 @@ public final WebElement markAll()
                     .refindWhenNeeded(elementCache().menuContent);
         }
 
-        public final WebElement viewAllLink = Locator.linkContainingText("View all activity").refindWhenNeeded(this);
+        public final WebElement viewAllLink()
+        {
+            return Locator.linkContainingText("View all activity").refindWhenNeeded(this);
+        }
 
     }