diff --git a/contribs/gmf/src/query/windowComponent.js b/contribs/gmf/src/query/windowComponent.js
index f3e9261f24d7..bde77e0e2a21 100644
--- a/contribs/gmf/src/query/windowComponent.js
+++ b/contribs/gmf/src/query/windowComponent.js
@@ -532,6 +532,7 @@ QueryWindowController.prototype.highlightCurrentFeature_ = function(opt_lastFeat
 QueryWindowController.prototype.close = function() {
   this.open = false;
   this.clear();
+  this.ngeoMapQuerent_.clear();
 };