diff --git a/extension/qfq/qfq/helper/HelperFormElement.php b/extension/qfq/qfq/helper/HelperFormElement.php
index d10b71ba01a435bde14e0fa771439548879f0ade..97547f9fb97c20cdbde040e5c4ae916681b6f7e6 100644
--- a/extension/qfq/qfq/helper/HelperFormElement.php
+++ b/extension/qfq/qfq/helper/HelperFormElement.php
@@ -335,11 +335,9 @@ class HelperFormElement {
         // INFO: $showinline =- TRUE ('input' elemente)
         if (isset($formElement[FE_INPUT_EXTRA_BUTTON_INFO]) && $showInline) {
             $extraButton .= <<<EOF
-            <div class="input-group-btn">
-                <button class="btn btn-info" onclick="$('#$id-extra-info').slideToggle('swing')">
-                    $infoSymbolInside
-                </button>
-            </div>
+            <button class="btn btn-info" onclick="$('#$id-extra-info').slideToggle('swing')">
+                $infoSymbolInside
+            </button>
 EOF;
 
             $value = $formElement[FE_INPUT_EXTRA_BUTTON_INFO];
@@ -379,12 +377,10 @@ EOF;
             $formElement[FE_MODE] = FE_MODE_READONLY;
 
             $extraButton .= <<<EOF
-            <div class="input-group-btn">
-                <button class="btn btn-info"
-                        onclick="$('#$id').prop('readonly',!$('#$id').prop('readonly'))">
-                    <span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
-                </button>
-            </div>
+            <button class="btn btn-info"
+                    onclick="$('#$id').prop('readonly',!$('#$id').prop('readonly'))">
+                <span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
+            </button>
 EOF;
         }
 
@@ -394,16 +390,14 @@ EOF;
             $formElement[FE_TYPE] = 'password';
 
             $extraButton .= <<<EOF
-            <div class="input-group-btn">
-                <button class="btn btn-info"
-                        onclick="$('#$id').attr('type',$('#$id').attr('type')==='password' ? 'text': 'password')">
-                    <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
-                </button>
-            </div>
+            <button class="btn btn-info"
+                    onclick="$('#$id').attr('type',$('#$id').attr('type')==='password' ? 'text': 'password')">
+                <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
+            </button>
 EOF;
         }
 
-        $formElement[FE_TMP_EXTRA_BUTTON_HTML] = $extraButton;
+        $formElement[FE_TMP_EXTRA_BUTTON_HTML] = Support::wrapTag('<div class="input-group-btn">', $extraButton, true);
         Support::setIfNotSet($formElement, FE_INPUT_EXTRA_BUTTON_INFO);
 
         return $formElement;