diff --git a/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java b/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
index e8ee4d0fb9..643fd1e033 100644
--- a/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
+++ b/src/org/labkey/test/components/ui/grids/ResponsiveGrid.java
@@ -328,6 +328,7 @@ public void clickColumnMenuItem(CharSequence columnIdentifier, String menuText,
         WebElement menu = Locator.css("ul.grid-header-cell__dropdown-menu.open").findWhenNeeded(getDriver());
         WebElement menuItem = Locator.css("li > a").containing(menuText).findWhenNeeded(menu);
         waitFor(menuItem::isDisplayed, 1000);
+        dismissPopover();
         if (waitForUpdate)
             doAndWaitForUpdate(menuItem::click);
         else
@@ -800,6 +801,17 @@ public Optional<String> getGridEmptyMessage()
         return msg;
     }
 
+    public void dismissPopover()
+    {
+        getWrapper().mouseOut();
+        Locators.popover.findOptionalElement(getDriver()).ifPresent(popover -> {
+            getWrapper().mouseOver(popover);
+            getWrapper().mouseOut();
+            getWrapper().mouseOver(elementCache().getGridHeaderManager().getColumnHeader(0).getElement());
+            getWrapper().shortWait().until(ExpectedConditions.invisibilityOf(popover));
+        });
+    }
+
     public List<FieldReference> getHeaders()
     {
         return Collections.unmodifiableList(elementCache().findHeaders());
@@ -971,6 +983,7 @@ static public Locator.XPathLocator responsiveGridByBaseId(String baseGridId)
         static final Locator emptyGrid = Locator.css("tbody tr.grid-empty");
         static final Locator spinner = Locator.byClass("fa-spinner");
         static final Locator headerCells = Locator.tagWithClass("th", "grid-header-cell");
+        static final Locator popover = Locator.byClass("popover");
         static public Locator.XPathLocator headerCellBody(String label)
         {
             return Locator.tagWithClass("div", "grid-header-cell__body")