diff --git a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly
index a97222848442..2bbdee3b9441 100644
--- a/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly
+++ b/core/src/main/resources/hudson/slaves/EnvironmentVariablesNodeProperty/config.jelly
@@ -26,19 +26,15 @@ THE SOFTWARE.
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <f:entry title="${%List of variables}" help="${descriptor.getHelpPage()}">
     <f:repeatable var="env" items="${instance.env}">
-      <table width="100%">
-        <f:entry title="${%Name}">
+      <div class="jenkins-two-columns">
+        <f:entry title="${%Name}" class="jenkins-!-margin-bottom-0">
           <f:textbox name="env.key" value="${env.key}" />
         </f:entry>
-        <f:entry title="${%Value}">
+        <f:entry title="${%Value}" class="jenkins-!-margin-bottom-0">
           <f:textbox name="env.value" value="${env.value}" />
         </f:entry>
-      	<f:entry title="">
-          <div align="right">
-            <f:repeatableDeleteButton />
-          </div>
-        </f:entry>
-      </table>
+      </div>
+      <f:repeatableDeleteButton />
     </f:repeatable>
   </f:entry>
 </j:jelly>
diff --git a/war/src/main/less/form/layout.less b/war/src/main/less/form/layout.less
index 0cdebc519859..0411fe441fce 100644
--- a/war/src/main/less/form/layout.less
+++ b/war/src/main/less/form/layout.less
@@ -138,3 +138,9 @@
     }
   }
 }
+
+.jenkins-two-columns {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-gap: var(--section-padding);
+}