diff --git a/tailbone/templates/forms2/deform.mako b/tailbone/templates/forms2/deform.mako
index 3a2206b3..ee70917e 100644
--- a/tailbone/templates/forms2/deform.mako
+++ b/tailbone/templates/forms2/deform.mako
@@ -69,7 +69,7 @@ ${h.csrf_token(request)}
 
 % if buttons:
     ${buttons|n}
-% elif not readonly:
+% elif not readonly and (buttons is Undefined or (buttons is not None and buttons is not False)):
     <div class="buttons">
       ## ${h.submit('create', form.create_label if form.creating else form.update_label)}
       ${h.submit('save', getattr(form, 'save_label', "Save"))}