diff --git a/templates/widgets/aform/aform.hamlet b/templates/widgets/aform/aform.hamlet
index 9674f2b77..d7e488ea0 100644
--- a/templates/widgets/aform/aform.hamlet
+++ b/templates/widgets/aform/aform.hamlet
@@ -9,13 +9,14 @@ $case formLayout
   $of _
     $forall view <- fieldViews
       $if fvId view == idFormSectionNoinput
-        <h3 .form-section-title :isFormVertical:.form--vertical>
-          ^{fvLabel view}
-        $maybe hint <- fvTooltip view
-          <div .form-section-title__hint :isFormVertical:.form--vertical>
-            ^{hint}
+        <div .form-section-title .interactive-fieldset__target :isFormVertical:.form--vertical>
+          <h3>
+            ^{fvLabel view}
+          $maybe hint <- fvTooltip view
+            <div .form-section-title__hint .interactive-fieldset__target :isFormVertical:.form--vertical>
+              ^{hint}
       $elseif fvId view == idFormMessageNoinput
-        <div .form-section-notification :isFormVertical:.form--vertical>
+        <div .form-section-notification .interactive-fieldset__target :isFormVertical:.form--vertical>
           ^{fvInput view}
       $else
         <div .form-group .interactive-fieldset__target :fvRequired view && not isFormWorkflowDataset:.form-group--required :fvRequired view && isFormWorkflowDataset:.form-group--potentially-required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error :isFormVertical:.form--vertical>