Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c -r3c05b880aafdbe1d6b13df766b971ac8ac1b35a8
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c -r3c05b880aafdbe1d6b13df766b971ac8ac1b35a8
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -r7ced9db5725f36fd33877261bd003223b2f834f1 -r3c05b880aafdbe1d6b13df766b971ac8ac1b35a8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 7ced9db5725f36fd33877261bd003223b2f834f1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 3c05b880aafdbe1d6b13df766b971ac8ac1b35a8)
@@ -506,9 +506,14 @@
 		return newToolActivity;
 	}
 	
-	public function closeBranchView() {
-		canvasModel.activeView = canvasView;
-		canvasModel.currentBranchingActivity = null;
+	public function closeBranchView() {
+		var parentBranching:CanvasActivity = null;
+		if(canvasModel.activeView.activity.parentUIID != null)
+			parentBranching = CanvasActivity(canvasModel.activitiesDisplayed.get(_ddm.getActivityByUIID(canvasModel.activeView.activity.parentUIID).parentUIID));
+		
+		canvasModel.activeView = (parentBranching.activity.isBranchingActivity()) ? parentBranching.branchView : canvasView;
+		canvasModel.currentBranchingActivity = (parentBranching.activity.isBranchingActivity()) ? parentBranching : null;
+		
 	}
 	
 	/**