diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
index e0d8d291f2..ef71f6254e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
@@ -386,7 +386,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 
         toolbar.updateToolbarAccess(adWindowId);
         updateToolbar();
-        if (toolbar.initDefaultQuery()) {
+        if (query == null && toolbar.initDefaultQuery()) {
         	doOnQueryChange();
         }