diff --git a/base/src/org/compiere/model/GridField.java b/base/src/org/compiere/model/GridField.java
index c4e1e98df5..e639734d53 100644
--- a/base/src/org/compiere/model/GridField.java
+++ b/base/src/org/compiere/model/GridField.java
@@ -372,6 +372,13 @@ public class GridField
 				return false;
 		}
 		
+		//  Always editable if Active
+		if (checkContext && "Y".equals(Env.getContext(m_vo.ctx, m_vo.WindowNo, "IsActive"))
+				&& (   m_vo.ColumnName.equals("Processing")
+					|| m_vo.ColumnName.equals("PaymentRule")
+					|| m_vo.ColumnName.equals("DocAction") 
+					|| m_vo.ColumnName.equals("GenerateTo")))
+			return true;
 
 		//  Record is Processed	***	
 		if (checkContext 
@@ -387,14 +394,6 @@ public class GridField
 		if (checkContext && !Env.getContext(m_vo.ctx, m_vo.WindowNo, "IsActive").equals("Y"))
 			return false;
 
-		// Bahman: Moved this check to here -after isActive check.
-		//  Always editable if Active
-		if (m_vo.ColumnName.equals("Processing")
-				|| m_vo.ColumnName.equals("PaymentRule")
-				|| m_vo.ColumnName.equals("DocAction")
-				|| m_vo.ColumnName.equals("GenerateTo"))
-			return true;
-
 		//  ultimately visibily decides
 		return isDisplayed (checkContext);
 	}	//	isEditable