diff --git a/src/org/labkey/test/components/ui/edit/EditInlineField.java b/src/org/labkey/test/components/ui/edit/EditInlineField.java
index b671437b2a..d093871956 100644
--- a/src/org/labkey/test/components/ui/edit/EditInlineField.java
+++ b/src/org/labkey/test/components/ui/edit/EditInlineField.java
@@ -61,7 +61,9 @@ public String getLabel()
 
     public String getValue()
     {
-        return elementCache().toggle().getText();
+        if (elementCache().hasToggle())
+            return elementCache().toggle().getText();
+        return getComponentElement().getText();
     }
 
     private boolean isOpen()
@@ -125,6 +127,11 @@ WebElement toggle()
             return toggleLoc.waitForElement(this, 1_000);
         }
 
+        boolean hasToggle()
+        {
+            return toggleLoc.existsIn(this);
+        }
+
         WebElement pencil()
         {
             return pencilLoc.waitForElement(this, 1_000);
diff --git a/src/org/labkey/test/components/ui/grids/DetailTable.java b/src/org/labkey/test/components/ui/grids/DetailTable.java
index 10d505df50..9a4d964ca6 100644
--- a/src/org/labkey/test/components/ui/grids/DetailTable.java
+++ b/src/org/labkey/test/components/ui/grids/DetailTable.java
@@ -109,6 +109,19 @@ else if (elementCache().dataFieldByKey(identifier).isDisplayed())
         }
     }
 
+    public boolean hasField(String identifier)
+    {
+        try
+        {
+            getField(identifier);
+            return true;
+        }
+        catch (NoSuchElementException nse)
+        {
+            return false;
+        }
+    }
+
     public boolean fieldHasFormatPill(String identifier)
     {
         return Locator.tagWithClass("*", "status-pill").existsIn(getField(identifier));