diff --git a/superset/assets/javascripts/explorev2/components/FieldSetRow.jsx b/superset/assets/javascripts/explorev2/components/FieldSetRow.jsx
index fd61b01123e5d..dbdaca72039d7 100644
--- a/superset/assets/javascripts/explorev2/components/FieldSetRow.jsx
+++ b/superset/assets/javascripts/explorev2/components/FieldSetRow.jsx
@@ -29,7 +29,7 @@ export default class FieldSetRow extends React.Component {
   render() {
     const colSize = NUM_COLUMNS / this.props.fieldSets.length;
     return (
-      <div className="row">
+      <div className="row space-2">
         {this.props.fieldSets.map((fs) => {
           const fieldData = this.getFieldData(fs);
           return (
diff --git a/superset/assets/stylesheets/less/cosmo/bootswatch.less b/superset/assets/stylesheets/less/cosmo/bootswatch.less
index e7f00d52a49b0..1274eae64ec86 100644
--- a/superset/assets/stylesheets/less/cosmo/bootswatch.less
+++ b/superset/assets/stylesheets/less/cosmo/bootswatch.less
@@ -412,3 +412,12 @@ a.list-group-item {
 hr {
   margin: 10px 0;
 }
+
+// generate space-n classes for vertical spacing
+.space-loop(@counter) when (@counter > 0) {
+  .space-loop((@counter - 1));    // next iteration
+  .space-@{counter} {
+    margin-bottom: (10px * @counter); // code for each iteration
+  }
+}
+.space-loop(6);