diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index d0991bb12536c9d866d345ce53b9adc7e46912eb..44016abefc4ce33c61bfe4e7c15dbd48d16c04a5 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -49,6 +49,20 @@ fieldset:not(.fieldgroup) > legend {
 .form-item {
   margin: 0.75em 0;
 }
+/**
+ * When a table row has a single form item, prevent it from adding unnecessary
+ * extra spacing. If it has multiple form items, allow spacing between them,
+ * overriding Classy.
+ */
+tr.odd .form-item,
+tr.even .form-item {
+  margin-top: 0.75em;
+  margin-bottom: 0.75em;
+}
+td > .form-item:only-child {
+  margin-top: 0;
+  margin-bottom: 0;
+}
 .form-type-checkbox {
   padding: 0;
 }