diff --git a/src/org/labkey/test/components/ui/grids/EditableGrid.java b/src/org/labkey/test/components/ui/grids/EditableGrid.java
index d0d0a2a515..2f6ec13e2b 100644
--- a/src/org/labkey/test/components/ui/grids/EditableGrid.java
+++ b/src/org/labkey/test/components/ui/grids/EditableGrid.java
@@ -1032,6 +1032,7 @@ public void dragFill(WebElement selectStart, WebElement selectEnd, WebElement dr
     {
         Locator.XPathLocator selectionHandleLoc = Locator.byClass("cell-selection-handle");
         selectCellRange(selectStart, selectEnd);
+        selectEnd.click();
         String fillValue = getCellValue(selectEnd);
         WebElement selectionHandle = selectionHandleLoc.waitForElement(getComponentElement(), 2_000);
         dragToCell(selectionHandle, dragEnd);
@@ -1039,6 +1040,7 @@ public void dragFill(WebElement selectStart, WebElement selectEnd, WebElement dr
         {
             // Fill didn't complete — the drag likely extended the selection without triggering the fill.
             selectCellRange(selectStart, selectEnd);
+            selectEnd.click();
             selectionHandle = selectionHandleLoc.waitForElement(getComponentElement(), 2_000);
             dragToCell(selectionHandle, dragEnd);
             WebDriverWrapper.waitFor(() -> fillValue.equals(getCellValue(dragEnd)),
diff --git a/src/org/labkey/test/pages/study/DatasetDesignerPage.java b/src/org/labkey/test/pages/study/DatasetDesignerPage.java
index 4de76d223a..b67d4bba8e 100644
--- a/src/org/labkey/test/pages/study/DatasetDesignerPage.java
+++ b/src/org/labkey/test/pages/study/DatasetDesignerPage.java
@@ -314,8 +314,8 @@ protected Locator dataRowRadioBtn(Integer index)
 
         protected FilteringReactSelect columnMapSelect(String labelText)
         {   // find the row with the specified label span, then get the select in it
-            WebElement container = Locator.tag("div").withChild(Locator.tag("div")
-                    .withChild(Locator.tagWithClass("span", "domain-no-wrap").withText(labelText)))
+            WebElement container = Locator.tag("div").withChild(Locator.tag("div").withChild(Locator.tag("span")
+                    .withChild(Locator.tagWithClass("span", "domain-no-wrap").withText(labelText))))
                     .waitForElement(fieldsPanel, 2000);
             return FilteringReactSelect.finder(getDriver()).find(container);
         }