diff --git a/application/forms/PreferenceForm.php b/application/forms/PreferenceForm.php
index 7fd9b02d0..ac24ee130 100644
--- a/application/forms/PreferenceForm.php
+++ b/application/forms/PreferenceForm.php
@@ -243,7 +243,11 @@ class PreferenceForm extends Form
                 ],
                 'value' => isset($value) ? $value : '',
                 'disable' => isset($disabled) ? $disabled : [],
-                'escape' => false
+                'escape' => false,
+                'decorators' => array_merge(
+                    array_slice(self::$defaultElementDecorators, 0, -1),
+                    [['HtmlTag', ['tag' => 'div', 'class' => 'control-group theme-mode']]]
+                )
             ]
         );