diff --git a/templates/table/colonnade.hamlet b/templates/table/colonnade.hamlet
index 90951ce7c..b109dd442 100644
--- a/templates/table/colonnade.hamlet
+++ b/templates/table/colonnade.hamlet
@@ -12,8 +12,7 @@ $if not psShortcircuit
           $forall OneColonnade{..} <- getColonnade dbtColonnade
             ^{widgetFromCell td $ oneColonnadeEncode row}
 $else
-  <tbody>
-    $forall row <- rows
-      <tr>
-        $forall OneColonnade{..} <- getColonnade dbtColonnade
-          ^{widgetFromCell td $ oneColonnadeEncode row}
+  $forall row <- rows
+    <tr>
+      $forall OneColonnade{..} <- getColonnade dbtColonnade
+        ^{widgetFromCell td $ oneColonnadeEncode row}
diff --git a/templates/table/layout.hamlet b/templates/table/layout.hamlet
index 009e4eb2c..eb5651cb3 100644
--- a/templates/table/layout.hamlet
+++ b/templates/table/layout.hamlet
@@ -1,6 +1,9 @@
-<div .table>
+$if not psShortcircuit
+  <div .table>
+    ^{table}
+    $if pageCount > 1
+      <p style="text-align:center">
+        $# TODO: foreach (reachable pages) print link to that page
+        _{MsgPage (succ psPage) pageCount}
+$else
   ^{table}
-  $if pageCount > 1
-    <p style="text-align:center">
-      $# TODO: foreach (reachable pages) print link to that page
-      _{MsgPage (succ psPage) pageCount}