diff --git a/lib/form/templates/element-template-inline.mustache b/lib/form/templates/element-template-inline.mustache
index d445e4858c2..b8f3c481f69 100644
--- a/lib/form/templates/element-template-inline.mustache
+++ b/lib/form/templates/element-template-inline.mustache
@@ -1,9 +1,14 @@
 <div class="form-group {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}" {{#element.groupname}}data-groupname="{{.}}"{{/element.groupname}}>
-    <label class="col-form-label {{#element.hiddenlabel}}sr-only{{/element.hiddenlabel}}" for="{{element.id}}">
-        {{{label}}} {{{helpbutton}}}
+    {{#label}}
+        <label class="col-form-label {{#element.hiddenlabel}}sr-only{{/element.hiddenlabel}}" for="{{element.id}}">
+            {{{label}}}
+        </label>
+    {{/label}}
+    <span>
+        {{{helpbutton}}}
         {{#required}}<abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>{{/required}}
         {{#advanced}}<abbr class="initialism text-info" title="{{#str}}advanced{{/str}}">!</abbr>{{/advanced}}
-    </label>
+    </span>
     <span data-fieldtype="{{element.type}}">
         {{$ element }}
             <!-- Element goes here -->