diff --git a/htroot/Tables_p.html b/htroot/Tables_p.html
index e86906371..2cf530956 100644
--- a/htroot/Tables_p.html
+++ b/htroot/Tables_p.html
@@ -85,7 +85,7 @@ document.write("<div id=\"api\">\<a href=\"api/table_p.xml" + window.location.se
         #{list}#
         <tr class="TableCell#(dark)#Light::Dark::Summary#(/dark)#">
           <td align="left"><input type="checkbox" name="item_#[count]#" value="pk_#[pk]#" /></td>
-          <td>#[pk]#</td>
+          <td><a href="Tables_p.html?editrow=pk_#[pk]#&table=#[table]#">#[pk]#</a></td>
           #{columns}#
           <td align="left">#[cell]#</td>
           #{/columns}#
diff --git a/htroot/Tables_p.java b/htroot/Tables_p.java
index 3e3aa5c42..640f38352 100644
--- a/htroot/Tables_p.java
+++ b/htroot/Tables_p.java
@@ -172,6 +172,7 @@ public class Tables_p {
                         prop.put("showtable_list_" + count + "_dark", ((dark) ? 1 : 0) ); dark=!dark;
                         prop.put("showtable_list_" + count + "_pk", UTF8.String(row.getPK()));
                         prop.put("showtable_list_" + count + "_count", count);
+                        prop.put("showtable_list_" + count + "_table", table); // tablename for edit link
                         for (int i = 0; i < columns.size(); i++) {
                             cell = row.get(columns.get(i));
                             prop.putHTML("showtable_list_" + count + "_columns_" + i + "_cell", cell == null ? "" : UTF8.String(cell));