diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
index 60306ea4e2..2566d20faf 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java
@@ -841,7 +841,7 @@ public class InfoProductWindow extends InfoWindow {
 	@Override
 	protected void prepareTable(ColumnInfo[] layout, String from, String where,
 			String orderBy) {
-		if (getSelectedWarehouseId() > 0)
+		if (Util.isEmpty(orderBy) && getSelectedWarehouseId() > 0)
 		{
 			orderBy = "QtyAvailable DESC";
 		}