diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
index 7db0b7384b..f5157ea0ca 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
@@ -310,7 +310,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
 	        gridWindow = new GridWindow(gWindowVO, true);
 	        title = gridWindow.getName();
 
-	        // Set AutoNew for Window
+	        // Set SO/AutoNew for Window
+	        Env.setContext(ctx, curWindowNo, "IsSOTrx", gridWindow.isSOTrx());
 	        if (!autoNew && gridWindow.isTransaction())
 	        {
 	            Env.setAutoNew(ctx, curWindowNo, true);
@@ -360,8 +361,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
 	        curTabIndex = 0;
 
 	        adTab.setSelectedIndex(0);	        
-	        // all fields context for window is clear at AbstractADTab.prepareContext, set IsSOTrx for window
-	        Env.setContext(ctx, curWindowNo, "IsSOTrx", gridWindow.isSOTrx());	        
+	        // all fields context for window is clear at AbstractADTab.prepareContext, set again IsSOTrx for window
+	        Env.setContext(ctx, curWindowNo, "IsSOTrx", gridWindow.isSOTrx());
 	        toolbar.enableTabNavigation(adTab.getTabCount() > 1);
 	        toolbar.enableFind(true);
 	        adTab.evaluate(null);