diff --git a/src/org/labkey/test/LabKeySiteWrapper.java b/src/org/labkey/test/LabKeySiteWrapper.java
index 9404a1f18d..0cc14f103e 100644
--- a/src/org/labkey/test/LabKeySiteWrapper.java
+++ b/src/org/labkey/test/LabKeySiteWrapper.java
@@ -1745,7 +1745,7 @@ public String getConversionErrorMessage(Object value, String fieldName, Class<?>
         return errorMessage;
     }
 
-    private ProductKey getProductConfiguration() throws IOException, CommandException
+    protected ProductKey getProductConfiguration() throws IOException, CommandException
     {
         SimpleGetCommand command = new SimpleGetCommand("admin", "productFeature");
         var resp = command.execute(createDefaultConnection(), "/");
diff --git a/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java b/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java
index 079f24ea7a..2721c39007 100644
--- a/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java
+++ b/src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java
@@ -10,6 +10,8 @@
 
 import java.util.List;
 
+import static org.labkey.test.WebDriverWrapper.sleep;
+
 /**
  * Wraps 'labkey-ui-component' defined in <code>internal/components/search/EntityFieldFilterModal.tsx</code>
  */
@@ -36,8 +38,13 @@ protected void waitForReady()
     public EntityFieldFilterModal selectQuery(String queryName)
     {
         WebElement queryItem = elementCache().findQueryOption(queryName);
-        getWrapper().doAndWaitForElementToRefresh(queryItem::click,
-                () -> elementCache().listItemLoc.findElement(elementCache().fieldsSelectionPanel), getWrapper().shortWait());
+        queryItem.click();
+        sleep(500); // wait for the fields to be displayed or updated.
+        // The wait below does not consistently work. It works for the first rendering of the modal, but
+        // if the modal is opened with a query already selected, selecting another query does not cause
+        // staleness of the field panel elements, only an update of the contents.
+//        getWrapper().doAndWaitForElementToRefresh(queryItem::click,
+//                () -> elementCache().listItemLoc.findElement(elementCache().fieldsSelectionPanel), getWrapper().shortWait());
 
         getWrapper().shortWait().until(ExpectedConditions.invisibilityOfElementLocated(BootstrapLocators.loadingSpinner));