diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 0f34553e91..ca087bfcf2 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -916,12 +916,16 @@ public function createElement($type, $name, $options = null)
                     || ($type === 'button' && isset($options['type']) && $options['type'] === 'submit'))
                 ) {
                     array_splice($options['decorators'], 1, 0, array(array('Spinner', array('separator' => ''))));
+                } elseif ($type === 'hidden') {
+                    $options['decorators'] = array('ViewHelper');
                 }
             }
         } else {
             $options = array('decorators' => static::$defaultElementDecorators);
             if ($type === 'submit') {
                 array_splice($options['decorators'], 1, 0, array(array('Spinner', array('separator' => ''))));
+            } elseif ($type === 'hidden') {
+                $options['decorators'] = array('ViewHelper');
             }
         }
 
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 772d73fd1d..5e4c42f467 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -12,10 +12,6 @@ input {
   }
 }
 
-.control-group ~ input[type="hidden"] {
-  display: none;
-}
-
 input.search {
   padding-left: 20px;
   background: @gray-lightest url('../img/icons/search.png') no-repeat 2px;