diff --git a/web/client/components/data/featuregrid/DockedFeatureGrid.jsx b/web/client/components/data/featuregrid/DockedFeatureGrid.jsx
index f4279efbc9..03ef556b56 100644
--- a/web/client/components/data/featuregrid/DockedFeatureGrid.jsx
+++ b/web/client/components/data/featuregrid/DockedFeatureGrid.jsx
@@ -263,7 +263,7 @@ const DockedFeatureGrid = React.createClass({
 
         let gridConf = this.props.pagination ? {dataSource: this.dataSource, features: []} : {features: this.props.features};
 
-        if (this.props.open || true) {
+        if (this.props.features && this.props.features.length > 0) {
             return (
                 <Dock
                     position={"bottom" /* 'left', 'top', 'right', 'bottom' */}
diff --git a/web/client/reducers/featuregrid.js b/web/client/reducers/featuregrid.js
index 5c4901da23..61d2e593dd 100644
--- a/web/client/reducers/featuregrid.js
+++ b/web/client/reducers/featuregrid.js
@@ -8,10 +8,12 @@
 const assign = require("object-assign");
 const {SELECT_FEATURES, SET_FEATURES} = require('../actions/featuregrid');
 
-function featuregrid(state = {
+const emptyResultsState = {
     select: [],
     features: []
-}, action) {
+};
+
+function featuregrid(state = emptyResultsState, action) {
     switch (action.type) {
         case SELECT_FEATURES:
             return assign({}, state, {select: action.features});
diff --git a/web/client/reducers/query.js b/web/client/reducers/query.js
index fd65fc02b1..9c3823ee13 100644
--- a/web/client/reducers/query.js
+++ b/web/client/reducers/query.js
@@ -17,6 +17,8 @@ const {
     RESET_QUERY
 } = require('../actions/wfsquery');
 
+const {QUERY_FORM_RESET} = require('../actions/queryform');
+
 const assign = require('object-assign');
 
 const types = {
@@ -110,6 +112,7 @@ function query(state = initialState, action) {
                 resultError: action.error
             });
         }
+        case QUERY_FORM_RESET:
         case RESET_QUERY: {
             return assign({}, state, {
                 result: '',