Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r93a02624adff176042f98649f582d3c919b652d4 -rb18810be6bdfea83a5c74ce79324d570ea98c8b0
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r93a02624adff176042f98649f582d3c919b652d4 -rb18810be6bdfea83a5c74ce79324d570ea98c8b0
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r74a445235e221c4f913040bb71336c990d54db9b -rb18810be6bdfea83a5c74ce79324d570ea98c8b0
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 74a445235e221c4f913040bb71336c990d54db9b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision b18810be6bdfea83a5c74ce79324d570ea98c8b0)
@@ -587,6 +587,10 @@
 				
 				branchType_cmb.selectedIndex=i;
 			}
+		}
+		
+		if(_canvasModel.getCanvas().ddm.editOverrideLock) {
+			branchType_cmb.enabled = false;
 		}
 		
 		if(_canvasModel.selectedItem.activity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE) {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r5af5bb429bf92b434cc20f26d92b8bdb4dca5dbd -rb18810be6bdfea83a5c74ce79324d570ea98c8b0
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 5af5bb429bf92b434cc20f26d92b8bdb4dca5dbd)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision b18810be6bdfea83a5c74ce79324d570ea98c8b0)
@@ -512,10 +512,6 @@
 			
 			toolActs_cmb.enabled = e;
 		}
-		
-		if(_canvasModel.getCanvas().ddm.editOverrideLock) {
-			branchType_cmb.enabled = false;
-		}
 	}
 	
 	/**