diff --git a/api/src/org/labkey/api/ldk/buttons/ShowEditUIButton.java b/api/src/org/labkey/api/ldk/buttons/ShowEditUIButton.java
index fa90c2f6d51..65b7348650f 100644
--- a/api/src/org/labkey/api/ldk/buttons/ShowEditUIButton.java
+++ b/api/src/org/labkey/api/ldk/buttons/ShowEditUIButton.java
@@ -84,7 +84,7 @@ protected String getHandlerName()
     @Override
     protected String getJsHandler(TableInfo ti)
     {
-        String ret = getHandlerName() + "(" + PageFlowUtil.jsString(_schemaName) + "," + PageFlowUtil.jsString(_queryName) + ",dataRegionName, {";
+        String ret = getHandlerName() + "(" + PageFlowUtil.jsString(ti.getPublicSchemaName()) + "," + PageFlowUtil.jsString(ti.getPublicName()) + ",dataRegionName, {";
 
         String delim = "";
         if (_urlParamMap != null)