diff --git a/web/client/components/data/query/QueryBuilder.jsx b/web/client/components/data/query/QueryBuilder.jsx
index 3a050417d1..a5c0133ffc 100644
--- a/web/client/components/data/query/QueryBuilder.jsx
+++ b/web/client/components/data/query/QueryBuilder.jsx
@@ -137,7 +137,7 @@ const QueryBuilder = React.createClass({
                     sortOptions={this.props.sortOptions}
                     hits={this.props.hits}
                     />
-                <div className="querypanel">
+                <div className="querypanel" style={{maxHeight: window.innerHeight - 170}}>
                     <GroupField
                         attributes={this.props.attributes}
                         groupLevels={this.props.groupLevels}
diff --git a/web/client/components/data/query/queryform.css b/web/client/components/data/query/queryform.css
index 41c0cdec72..583adf5451 100644
--- a/web/client/components/data/query/queryform.css
+++ b/web/client/components/data/query/queryform.css
@@ -147,7 +147,6 @@
     /*border-bottom: 2px dotted #dedede;*/
     overflow: hidden;
     background-color: #ffffff;
-    margin-bottom: 20px;
 }
 
 #query-form-panel #query-toolbar-title {
@@ -272,10 +271,10 @@
 }
 
 .querypanel {
-    max-height: 660px;
     overflow-x: hidden;
     overflow-y: auto;
     border: none;
+    padding-bottom: 150px;
 }
 
 /*****************************/