diff --git a/core/src/main/resources/hudson/tools/ToolLocationNodeProperty/config.jelly b/core/src/main/resources/hudson/tools/ToolLocationNodeProperty/config.jelly
index 5a38fbd626e1..14da095e3492 100644
--- a/core/src/main/resources/hudson/tools/ToolLocationNodeProperty/config.jelly
+++ b/core/src/main/resources/hudson/tools/ToolLocationNodeProperty/config.jelly
@@ -28,24 +28,21 @@
 		<f:repeatable var="location" name="locations" items="${instance.locations}">
 			<table width="100%">
 				<f:entry title="${%Name}">
-                  <select class="jenkins-input" name="locations.key">
-                    <j:forEach var="toolDescriptor" items="${descriptor.toolDescriptors}">
-                        <j:forEach var="toolInstallation" items="${toolDescriptor.installations}">
-                            <f:option selected="${descriptor.getKey(toolInstallation)==location.key}" value="${descriptor.getKey(toolInstallation)}">(${toolDescriptor.displayName}) ${toolInstallation.name}</f:option>
-                        </j:forEach>
-                    </j:forEach>
-                  </select>
+          <div class="jenkins-select">
+            <select class="jenkins-select__input" name="locations.key">
+              <j:forEach var="toolDescriptor" items="${descriptor.toolDescriptors}">
+                <j:forEach var="toolInstallation" items="${toolDescriptor.installations}">
+                  <f:option selected="${descriptor.getKey(toolInstallation)==location.key}" value="${descriptor.getKey(toolInstallation)}">(${toolDescriptor.displayName}) ${toolInstallation.name}</f:option>
+                </j:forEach>
+              </j:forEach>
+            </select>
+          </div>
 				</f:entry>
 				<f:entry title="${%Home}">
 					<f:textbox name="locations.home" value="${location.home}" />
 				</f:entry>
-				<f:entry title="">
-					<div align="right">
-						<f:repeatableDeleteButton />
-					</div>
-				</f:entry>
+        <f:repeatableDeleteButton />
 			</table>
 		</f:repeatable>
 	</f:entry>
-
 </j:jelly>