diff --git a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
index da4c353961d7..05c95c0f7ca5 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
@@ -55,7 +55,9 @@ THE SOFTWARE.
       <j:forEach var="descriptor" items="${h.getSortedDescriptorsForGlobalConfigUnclassifiedReadable()}">
         <j:set var="readOnlyMode" value="${!editable.contains(descriptor)}" />
         <j:set var="instance" value="${descriptor}" /><!-- this makes the <f:textbox field=.../> work -->
-        <st:include page="${descriptor.globalConfigPage}" from="${descriptor}" />
+        <f:rowSet name="${descriptor.jsonSafeClassName}">
+          <st:include page="${descriptor.globalConfigPage}" from="${descriptor}" />
+        </f:rowSet>
       </j:forEach>
 
       <l:hasPermission permission="${app.SYSTEM_READ}">
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index b2f9894526c3..91e5293a9601 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -1161,10 +1161,6 @@ div.to-be-removed { display: none; }
 
 /* ========================= Other form related CSS ========================= */
 
-.form-container {
-  max-width: 100%;
-}
-
 .radioBlock-container {
   margin-bottom: 0.66rem;