diff --git a/templates/widgets/form/form.hamlet b/templates/widgets/form/form.hamlet
index cd076cf1f..ed15e2aea 100644
--- a/templates/widgets/form/form.hamlet
+++ b/templates/widgets/form/form.hamlet
@@ -1,18 +1,19 @@
 $newline never
 $# Wrapper for all kinds of forms
-<form ##{formId} method=#{decodeUtf8 (renderStdMethod formMethod)} action=#{fromMaybe "" formActionUrl} enctype=#{formEncoding} *{formAttrs}>
-  $# Distinguish different falvours of submit button layouts here:
-  $case formSubmit
-    $of FormNoSubmit
-      ^{formWidget}
-    $of FormSubmit
-      ^{formWidget}
-      ^{submitButtonView}
-    $of FormDualSubmit
-      ^{submitButtonView}
-      ^{formWidget}
-      ^{submitButtonView}
-    $of FormAutoSubmit
-      ^{formWidget}
-      <button type=submit data-autosubmit>
-        ^{btnLabel BtnSubmit}
+<section>
+  <form ##{formId} method=#{decodeUtf8 (renderStdMethod formMethod)} action=#{fromMaybe "" formActionUrl} enctype=#{formEncoding} *{formAttrs}>
+    $# Distinguish different falvours of submit button layouts here:
+    $case formSubmit
+      $of FormNoSubmit
+        ^{formWidget}
+      $of FormSubmit
+        ^{formWidget}
+        ^{submitButtonView}
+      $of FormDualSubmit
+        ^{submitButtonView}
+        ^{formWidget}
+        ^{submitButtonView}
+      $of FormAutoSubmit
+        ^{formWidget}
+        <button type=submit data-autosubmit>
+          ^{btnLabel BtnSubmit}