diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 107b27464..ea3de1b9a 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -23,6 +23,16 @@ form.icinga-form {
     // Negative margin-right because every child gets 1em right but we can't exclude
     // the last element as it's impossible to identify the last *visible* element
     margin: 1em -1em 1em 0;
+
+    > fieldset {
+      > .control-group:first-of-type {
+        margin-top: 0;
+      }
+
+      > .control-group:last-of-type {
+        margin-bottom: 0;
+      }
+    }
   }
 
   .control-group > :not(.control-label-group) {
@@ -172,6 +182,7 @@ form.icinga-form {
   input[type="datetime-local"],
   input[type="date"],
   input[type="time"],
+  .control-group > fieldset,
   textarea,
   select {
     flex: 1 1 auto;