diff --git a/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java b/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java
index e69e56a5ca..180b73ab91 100644
--- a/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java
+++ b/src/org/labkey/test/components/ui/domainproperties/EntityTypeDesigner.java
@@ -436,7 +436,8 @@ Optional<WebElement> optionalWarningAlert()
 
         public final WebElement helpTarget(String divLabelText)
         {
-            return Locator.xpath(String.format("//span[text()='%s']//div[@class='overlay-trigger']", divLabelText)).findWhenNeeded(this);
+            String element = getThis().getClass().getSimpleName().contains("SampleType")? "div" : "span";
+            return Locator.xpath(String.format("//%s[text()='%s']//div[@class='overlay-trigger']", element, divLabelText)).findWhenNeeded(this);
         }
 
         // Tool tips exist on the page, outside the scope of the domainDesigner, so scope the search accordingly.