diff --git a/src/org/labkey/test/components/ui/grids/GridFilterModal.java b/src/org/labkey/test/components/ui/grids/GridFilterModal.java
index b597356abf..5f34cbcb5b 100644
--- a/src/org/labkey/test/components/ui/grids/GridFilterModal.java
+++ b/src/org/labkey/test/components/ui/grids/GridFilterModal.java
@@ -26,7 +26,12 @@ public class GridFilterModal extends ModalDialog
 
     public GridFilterModal(WebDriver driver, UpdatingComponent linkedComponent)
     {
-        super(new ModalDialogFinder(driver));
+        this(driver, linkedComponent, "Filter");
+    }
+
+    public GridFilterModal(WebDriver driver, UpdatingComponent linkedComponent, String titlePrefix)
+    {
+        super(new ModalDialogFinder(driver).withTitle(titlePrefix));
         _linkedComponent = linkedComponent;
     }
 
diff --git a/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java b/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java
index 2721c39007..74e8526be9 100644
--- a/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java
+++ b/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java
@@ -19,7 +19,7 @@ public class EntityFieldFilterModal extends GridFilterModal
 {
     public EntityFieldFilterModal(WebDriver driver, UpdatingComponent linkedComponent)
     {
-        super(driver, linkedComponent);
+        super(driver, linkedComponent, "Select");
     }
 
     @Override