diff --git a/contribs/gmf/src/query/windowComponent.js b/contribs/gmf/src/query/windowComponent.js
index bde77e0e2a21..fa7b65fbe71d 100644
--- a/contribs/gmf/src/query/windowComponent.js
+++ b/contribs/gmf/src/query/windowComponent.js
@@ -254,7 +254,8 @@ export function QueryWindowController(
       if (newQueryResult.total > 0) {
         this.show();
       } else if (oldQueryResult !== newQueryResult) {
-        this.close();
+        this.open = false;
+        this.clear();
       }
     });
 }