diff --git a/superset/assets/javascripts/explorev2/components/ControlPanelSection.jsx b/superset/assets/javascripts/explorev2/components/ControlPanelSection.jsx
index a6fe2e3bb4a..25607d36e03 100644
--- a/superset/assets/javascripts/explorev2/components/ControlPanelSection.jsx
+++ b/superset/assets/javascripts/explorev2/components/ControlPanelSection.jsx
@@ -32,7 +32,10 @@ export default class ControlPanelSection extends React.Component {
 
   render() {
     return (
-      <Panel header={this.renderHeader()}>
+      <Panel
+        className="control-panel-section"
+        header={this.renderHeader()}
+      >
         {this.props.children}
       </Panel>
     );
diff --git a/superset/assets/javascripts/explorev2/components/FieldSetRow.jsx b/superset/assets/javascripts/explorev2/components/FieldSetRow.jsx
index 625c8761e3f..904cddf1209 100644
--- a/superset/assets/javascripts/explorev2/components/FieldSetRow.jsx
+++ b/superset/assets/javascripts/explorev2/components/FieldSetRow.jsx
@@ -9,7 +9,7 @@ const propTypes = {
 function FieldSetRow(props) {
   const colSize = NUM_COLUMNS / props.fields.length;
   return (
-    <div className="row space-2">
+    <div className="row space-1">
       {props.fields.map((field, i) => (
         <div className={`col-lg-${colSize} col-xs-12`} key={i} >
           {field}
diff --git a/superset/assets/javascripts/explorev2/main.css b/superset/assets/javascripts/explorev2/main.css
index 145b70711c4..0d56bca3728 100644
--- a/superset/assets/javascripts/explorev2/main.css
+++ b/superset/assets/javascripts/explorev2/main.css
@@ -25,3 +25,8 @@
     margin-top: 0px;
     margin-right: 3px;
 }
+
+.control-panel-section {
+  margin-bottom: 0px;
+  box-shadow: none;
+}