diff --git a/superset/assets/javascripts/SqlLab/components/RunQueryActionButton.jsx b/superset/assets/javascripts/SqlLab/components/RunQueryActionButton.jsx
index e1f6440e1..6ad5cc412 100644
--- a/superset/assets/javascripts/SqlLab/components/RunQueryActionButton.jsx
+++ b/superset/assets/javascripts/SqlLab/components/RunQueryActionButton.jsx
@@ -65,12 +65,7 @@ export default function RunQueryActionButton(props) {
   } else {
     button = syncBtn;
   }
-
-  return (
-    <div className="inline m-r-5 pull-left">
-      {button}
-    </div>
-  );
+  return button;
 }
 
 RunQueryActionButton.propTypes = propTypes;
diff --git a/superset/assets/javascripts/SqlLab/components/SqlEditor.jsx b/superset/assets/javascripts/SqlLab/components/SqlEditor.jsx
index 91fde9649..4dcaede72 100644
--- a/superset/assets/javascripts/SqlLab/components/SqlEditor.jsx
+++ b/superset/assets/javascripts/SqlLab/components/SqlEditor.jsx
@@ -165,21 +165,26 @@ class SqlEditor extends React.PureComponent {
       <div className="sql-toolbar clearfix" id="js-sql-toolbar">
         <div className="pull-left">
           <Form inline>
-            <RunQueryActionButton
-              allowAsync={this.props.database ? this.props.database.allow_run_async : false}
-              dbId={qe.dbId}
-              queryState={this.props.latestQuery && this.props.latestQuery.state}
-              runQuery={this.runQuery.bind(this)}
-              selectedText={qe.selectedText}
-              stopQuery={this.stopQuery.bind(this)}
-            />
-            <SaveQuery
-              defaultLabel={qe.title}
-              sql={qe.sql}
-              onSave={this.props.actions.saveQuery}
-              schema={qe.schema}
-              dbId={qe.dbId}
-            />
+            <span className="m-r-5">
+              <RunQueryActionButton
+                allowAsync={this.props.database ? this.props.database.allow_run_async : false}
+                dbId={qe.dbId}
+                queryState={this.props.latestQuery && this.props.latestQuery.state}
+                runQuery={this.runQuery.bind(this)}
+                selectedText={qe.selectedText}
+                stopQuery={this.stopQuery.bind(this)}
+              />
+            </span>
+            <span className="m-r-5">
+              <SaveQuery
+                defaultLabel={qe.title}
+                sql={qe.sql}
+                className="m-r-5"
+                onSave={this.props.actions.saveQuery}
+                schema={qe.schema}
+                dbId={qe.dbId}
+              />
+            </span>
             {ctasControls}
           </Form>
         </div>
diff --git a/superset/assets/stylesheets/superset.less b/superset/assets/stylesheets/superset.less
index a42c8ba56..89ba020ad 100644
--- a/superset/assets/stylesheets/superset.less
+++ b/superset/assets/stylesheets/superset.less
@@ -32,10 +32,6 @@ input.form-control {
     background-color: white;
 }
 
-input.form-control.input-sm {
-  height: 36px;
-}
-
 .chart-header a.danger {
     color: red;
 }