diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java
index 5a11dc9e6a..67b20025a3 100644
--- a/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java
+++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java
@@ -473,6 +473,14 @@ public abstract class CreateFromShipment extends CreateFrom
 			}
 		}
 		
+		// Try to get from locator field
+		if (locator == null)
+		{
+			if (defaultLocator_ID > 0)
+			{
+				locator = MLocator.get(Env.getCtx(), defaultLocator_ID);
+			}
+		}
 		// Try to use default locator from Order Warehouse
 		if (locator == null && p_order != null && p_order.getM_Warehouse_ID() == getM_Warehouse_ID())
 		{
@@ -482,14 +490,6 @@ public abstract class CreateFromShipment extends CreateFrom
 				locator = wh.getDefaultLocator();
 			}
 		}
-		// Try to get from locator field
-		if (locator == null)
-		{
-			if (defaultLocator_ID > 0)
-			{
-				locator = MLocator.get(Env.getCtx(), defaultLocator_ID);
-			}
-		}
 		// Validate Warehouse
 		if (locator == null || locator.getM_Warehouse_ID() != getM_Warehouse_ID())
 		{