diff --git a/web/client/components/data/query/QueryBuilder.jsx b/web/client/components/data/query/QueryBuilder.jsx
index fc00ba6747..5cb3c190f3 100644
--- a/web/client/components/data/query/QueryBuilder.jsx
+++ b/web/client/components/data/query/QueryBuilder.jsx
@@ -114,23 +114,6 @@ const QueryBuilder = React.createClass({
     render() {
         return this.props.attributes.length > 0 ? (
             <div id="queryFormPanel">
-                <div className="querypanel">
-                    <GroupField
-                        attributes={this.props.attributes}
-                        groupLevels={this.props.groupLevels}
-                        filterFields={this.props.filterFields}
-                        groupFields={this.props.groupFields}
-                        removeButtonIcon={this.props.removeButtonIcon}
-                        addButtonIcon={this.props.addButtonIcon}
-                        attributePanelExpanded={this.props.attributePanelExpanded}
-                        actions={this.props.attributeFilterActions}/>
-                    <SpatialFilter
-                        useMapProjection={this.props.useMapProjection}
-                        spatialField={this.props.spatialField}
-                        spatialPanelExpanded={this.props.spatialPanelExpanded}
-                        showDetailsPanel={this.props.showDetailsPanel}
-                        actions={this.props.spatialFilterActions}/>
-                </div>
                 <QueryToolbar
                     params={this.props.params}
                     filterFields={this.props.filterFields}
@@ -148,6 +131,23 @@ const QueryBuilder = React.createClass({
                     sortOptions={this.props.sortOptions}
                     hits={this.props.hits}
                     />
+                <div className="querypanel">
+                    <GroupField
+                        attributes={this.props.attributes}
+                        groupLevels={this.props.groupLevels}
+                        filterFields={this.props.filterFields}
+                        groupFields={this.props.groupFields}
+                        removeButtonIcon={this.props.removeButtonIcon}
+                        addButtonIcon={this.props.addButtonIcon}
+                        attributePanelExpanded={this.props.attributePanelExpanded}
+                        actions={this.props.attributeFilterActions}/>
+                    <SpatialFilter
+                        useMapProjection={this.props.useMapProjection}
+                        spatialField={this.props.spatialField}
+                        spatialPanelExpanded={this.props.spatialPanelExpanded}
+                        showDetailsPanel={this.props.showDetailsPanel}
+                        actions={this.props.spatialFilterActions}/>
+                </div>
             </div>
         ) : (<div style={{margin: "0 auto", width: "60px"}}><Spinner spinnerName="three-bounce"/></div>);
     }
diff --git a/web/client/components/data/query/QueryToolbar.jsx b/web/client/components/data/query/QueryToolbar.jsx
index 3fcc3d31ea..4225574938 100644
--- a/web/client/components/data/query/QueryToolbar.jsx
+++ b/web/client/components/data/query/QueryToolbar.jsx
@@ -66,8 +66,8 @@ const QueryToolbar = React.createClass({
             (!fieldsWithValues && !this.props.spatialField.geometry);
 
         return (
-            <div>
-                <ButtonToolbar className="queryFormToolbar">
+            <div className="container-fluid">
+                <ButtonToolbar className="queryFormToolbar row-fluid pull-right">
                     <Button disabled={queryDisabled} id="query" onClick={this.search}>
                         <Glyphicon glyph="glyphicon glyphicon-search"/>
                         <span style={{paddingLeft: "2px"}}><strong><I18N.Message msgId={"queryform.query"}/></strong></span>
diff --git a/web/client/components/data/query/queryform.css b/web/client/components/data/query/queryform.css
index e312da7409..2648b824c1 100644
--- a/web/client/components/data/query/queryform.css
+++ b/web/client/components/data/query/queryform.css
@@ -114,15 +114,8 @@
 }
 
 .querypanel{
-    height: 660px;
     max-height: 660px;
     overflow-x: hidden;
     overflow-y: auto;
     border: none;
-    min-width: 700px;
-}
-
-.queryFormToolbar{
-    float: right;
-    padding-top: 15px;
 }