Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r1d4d284be0fb2b3eacf000364553f72c70e46eae -r6b45584aaab74017fadc92838765de69ae712185
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r1d4d284be0fb2b3eacf000364553f72c70e46eae -r6b45584aaab74017fadc92838765de69ae712185
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r64f42c88ebf08393b1c53bbd00c3cd4fec211c10 -r6b45584aaab74017fadc92838765de69ae712185
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 64f42c88ebf08393b1c53bbd00c3cd4fec211c10)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 6b45584aaab74017fadc92838765de69ae712185)
@@ -941,11 +941,13 @@
 		Debugger.log('Set gate type to: _canvasModel.selectedItem.activity.title:'+_canvasModel.selectedItem.activity.title,Debugger.GEN,'onGateTypeChange','PropertyInspector');
 		checkEnableGateControls(!_canvasModel.selectedItem.activity.readOnly); // show/hide schedule steppers
 		
-		if(evt.target.value == Activity.CONDITION_GATE_ACTIVITY_TYPE) {
+		var isConditionGate:Boolean = (evt.target.value == Activity.CONDITION_GATE_ACTIVITY_TYPE);
+		showToolBasedGateControls(isConditionGate, !_canvasModel.selectedItem.activity.readOnly);
+		
+		if(isConditionGate) {
 				
 			Debugger.log("Activity is of CONDITION_GATE_TYPE", Debugger.CRITICAL, "onGateTypeChange", "PropertyInspectorControls");
 			
-			showToolBasedGateControls(true, !_canvasModel.selectedItem.activity.readOnly);
 			_canvasModel.selectedItem.activity.groupingUIID = null;
 			
 			showGroupBasedBranchingControls(false);
@@ -1135,7 +1137,14 @@
 		
 		var selectedActIsConditionGate:Boolean = (_canvasModel.selectedItem.activity.activityTypeID == Activity.CONDITION_GATE_ACTIVITY_TYPE);
 		
-		if(!v) { _tool_output_gate_match_btn.visible = false; _conditions_setup_btn.visible = false; return; }
+		if(!v) {
+			_tool_output_gate_match_btn.visible = false;
+			_conditions_setup_btn.visible = false;
+			branchToolActs_lbl.visible = false;
+			toolActs_cmb.visible = false;
+			
+			return;
+		}
 		
 		toolActs_cmb.visible = v;
 		branchToolActs_lbl.visible = v;