diff --git a/superset/assets/src/SqlLab/components/ResultSet.jsx b/superset/assets/src/SqlLab/components/ResultSet.jsx
index 7c3ea195f588..6f188ed90ab6 100644
--- a/superset/assets/src/SqlLab/components/ResultSet.jsx
+++ b/superset/assets/src/SqlLab/components/ResultSet.jsx
@@ -51,7 +51,7 @@ const defaultProps = {
   database: {},
 };
 
-const SEARCH_HEIGHT = 46;
+const SEARCH_HEIGHT = 186;
 
 const LOADING_STYLES = { position: 'relative', minHeight: 100 };
 
diff --git a/superset/assets/src/SqlLab/main.less b/superset/assets/src/SqlLab/main.less
index 28755a37c326..0cd9cb3a4e32 100644
--- a/superset/assets/src/SqlLab/main.less
+++ b/superset/assets/src/SqlLab/main.less
@@ -195,10 +195,6 @@ div.Workspace {
 }
 
 .SqlLab {
-    .tab-content {
-        height: 100%;
-    }
-
     #brace-editor {
         height: calc(100% - 51px);
     }
diff --git a/superset/assets/src/components/FilterableTable/FilterableTable.jsx b/superset/assets/src/components/FilterableTable/FilterableTable.jsx
index 03691a14685c..4b66858d7c40 100644
--- a/superset/assets/src/components/FilterableTable/FilterableTable.jsx
+++ b/superset/assets/src/components/FilterableTable/FilterableTable.jsx
@@ -189,7 +189,7 @@ export default class FilterableTable extends PureComponent {
           <Table
             ref="Table"
             headerHeight={headerHeight}
-            height={height - 2}
+            height={height - 20}
             overscanRowCount={overscanRowCount}
             rowClassName={this.rowClassName}
             rowHeight={rowHeight}