diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index d2480669..73dc65d1 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -19,6 +19,7 @@ next (will be 1.8.0)
 * FEATURE: Inspect is now available for Packages, Stages and Files (#1995)
 * FEATURE: Allow to disable the Director frontend / UI (#2007)
 * FEATURE: Endpoints table now shows the object type (e.g. external) (#2050)
+* FEATURE: make sure that form label and fields stay close together (#2136)
 
 ### Import and Sync
 * FEATURE: allow to define update-only Sync Rules (#2059)
diff --git a/public/css/module.less b/public/css/module.less
index 686217be..d153b3cf 100644
--- a/public/css/module.less
+++ b/public/css/module.less
@@ -11,6 +11,10 @@ a:before {
   text-decoration: none;
 }
 
+form {
+  max-width: 68em;
+}
+
 form:focus {
   outline: none;
 }