diff --git a/src/org/labkey/test/components/react/BaseReactSelect.java b/src/org/labkey/test/components/react/BaseReactSelect.java
index cc35b0acc6..43aec6e465 100644
--- a/src/org/labkey/test/components/react/BaseReactSelect.java
+++ b/src/org/labkey/test/components/react/BaseReactSelect.java
@@ -649,7 +649,7 @@ public BaseReactSelectFinder<Select> withinFormGroup(String labelText)
         public BaseReactSelectFinder<Select> withinFormGroupSkipSelect(String labelText)
         {
             _locator = Locator.tagWithClass("div", "form-group")
-                    .withChild(Locator.tag("label").withPredicate("text() = " + Locator.xq(labelText)));
+                    .withChild(Locator.tag("label").withChild(Locator.tagWithText("span", labelText)));
             return this;
         }
 
diff --git a/src/org/labkey/test/components/ui/edit/EditInlineField.java b/src/org/labkey/test/components/ui/edit/EditInlineField.java
index 13478d97b5..b671437b2a 100644
--- a/src/org/labkey/test/components/ui/edit/EditInlineField.java
+++ b/src/org/labkey/test/components/ui/edit/EditInlineField.java
@@ -33,14 +33,25 @@ public WebDriver getDriver()
         return _driver;
     }
 
-    public void setValue(String value)
+    public void setValue(String value, boolean skipEnter)
     {
         open();
         WebElement input = elementCache().input;
         // 'setFormElement' calls 'WebElement.clear()' which can close the edit-in-place input
         getWrapper().actionClear(input);
-        input.sendKeys(value, Keys.ENTER);
-        getWrapper().shortWait().until(ExpectedConditions.stalenessOf(input));
+
+        if (skipEnter)
+            input.sendKeys(value);
+        else
+        {
+            input.sendKeys(value, Keys.ENTER);
+            getWrapper().shortWait().until(ExpectedConditions.stalenessOf(input));
+        }
+    }
+
+    public void setValue(String value)
+    {
+        setValue(value, false);
     }
 
     public String getLabel()