Index: openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl,v
diff -u -r1.3.2.13 -r1.3.2.14
--- openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	14 Sep 2016 09:24:46 -0000	1.3.2.13
+++ openacs-4/packages/xowiki/tcl/bootstrap-procs.tcl	22 Sep 2016 08:08:09 -0000	1.3.2.14
@@ -491,9 +491,21 @@
     } else {
       set name [::xowiki::Includelet js_name [self]]
     }
-
-    html::div -id [my set id]_wrapper -class "table-responsive" {
-      html::form -name $name -id $name -method POST { 
+    if {[llength $bulkactions]>0} {
+      html::div -id [my set id]_wrapper -class "table-responsive" {
+        html::form -name $name -id $name -method POST { 
+          html::div -id [my set id]_container {
+            html::table -id [my set id] -class [my set css.table-class] {
+              my render-actions
+              my render-body
+            }
+            if {[llength $bulkactions]>0} { my render-bulkactions }
+          }
+        }
+      }
+    } else {
+      #nesting forms inside a xowf page will place the action buttons at the wrong place!
+      html::div -id [my set id]_wrapper -class "table-responsive" {
         html::div -id [my set id]_container {
           html::table -id [my set id] -class [my set css.table-class] {
             my render-actions
@@ -505,7 +517,6 @@
     }
   }
 
-
   #Class create BootstrapTableRenderer::AnchorField -superclass TABLE::AnchorField
 
   Class create BootstrapTableRenderer::AnchorField \