diff --git a/src/org/labkey/test/components/ui/grids/EditableGrid.java b/src/org/labkey/test/components/ui/grids/EditableGrid.java
index 8ceb908fee..04aba55749 100644
--- a/src/org/labkey/test/components/ui/grids/EditableGrid.java
+++ b/src/org/labkey/test/components/ui/grids/EditableGrid.java
@@ -992,6 +992,7 @@ public void selectCellRange(WebElement startCell, WebElement endCell)
     private void dragToCell(WebElement elementToDrag, WebElement destinationCell)
     {
         var size = destinationCell.getSize();
+        dismissPopover();
 
         new Actions(getDriver())
                 // WebDriver doesn't calculate correct location to click the cell selection handle
@@ -1172,6 +1173,7 @@ public String getCellPopoverText(int row, CharSequence columnIdentifier)
 
     public void dismissPopover()
     {
+        getWrapper().mouseOut();
         Locators.popover.findOptionalElement(getDriver()).ifPresent(popover -> {
             getWrapper().mouseOver(popover);
             getWrapper().mouseOut();