diff --git a/web/client/components/data/query/QueryBuilder.jsx b/web/client/components/data/query/QueryBuilder.jsx
index 3a050417d1..65949bada2 100644
--- a/web/client/components/data/query/QueryBuilder.jsx
+++ b/web/client/components/data/query/QueryBuilder.jsx
@@ -47,7 +47,8 @@ const QueryBuilder = React.createClass({
         resultTitle: React.PropTypes.string,
         pagination: React.PropTypes.object,
         sortOptions: React.PropTypes.object,
-        hits: React.PropTypes.bool
+        hits: React.PropTypes.bool,
+        maxHeight: React.PropTypes.number
     },
     getDefaultProps() {
         return {
@@ -72,6 +73,7 @@ const QueryBuilder = React.createClass({
             pagination: null,
             sortOptions: null,
             hits: false,
+            maxHeight: 830,
             attributeFilterActions: {
                 onAddGroupField: () => {},
                 onAddFilterField: () => {},
@@ -137,7 +139,7 @@ const QueryBuilder = React.createClass({
                     sortOptions={this.props.sortOptions}
                     hits={this.props.hits}
                     />
-                <div className="querypanel">
+                <div className="querypanel" style={{maxHeight: this.props.maxHeight - 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;
 }
 
 /*****************************/
diff --git a/web/client/plugins/TOC.jsx b/web/client/plugins/TOC.jsx
index 29fca7d150..0d91c8e267 100644
--- a/web/client/plugins/TOC.jsx
+++ b/web/client/plugins/TOC.jsx
@@ -81,7 +81,8 @@ const SmartQueryForm = connect((state) => {
         ogcVersion: "1.1.0",
         params: {typeName: state.query && state.query.typeName},
         resultTitle: "Query Result",
-        showGeneratedFilter: false
+        showGeneratedFilter: false,
+        maxHeight: state.map && state.map.present && state.map.present.size && state.map.present.size.height
     };
 }, dispatch => {
     return {