Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rdfa4347e1edd106031d82c46bf8d1996704d91f5 -rd692ec6f9bf348950e680556e307e32f1d504cbd
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rdfa4347e1edd106031d82c46bf8d1996704d91f5 -rd692ec6f9bf348950e680556e307e32f1d504cbd
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rdfa4347e1edd106031d82c46bf8d1996704d91f5 -rd692ec6f9bf348950e680556e307e32f1d504cbd
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision dfa4347e1edd106031d82c46bf8d1996704d91f5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision d692ec6f9bf348950e680556e307e32f1d504cbd)
@@ -97,8 +97,10 @@
 				_canvasModel.isDragging = false;
 				return;
 			} else {
-				ca.depthHistory = ca.getDepth();
-				ca.swapDepths(DepthManager.kTopmost);
+				if (ca.activity.isOptionalActivity() || ca.activity.isOptionsWithSequencesActivity()) {
+					ca.depthHistory = ca.getDepth();
+					ca.swapDepths(DepthManager.kTopmost);
+				}
 				ca.startDrag(false);
 				_canvasModel.isDragging = true;
 			}
@@ -162,8 +164,10 @@
 		 
 	    if(_canvasModel.isDragging){
 			ca.stopDrag();
-			ca.swapDepths(ca.depthHistory);
-			ca.depthHistory = null;
+			if (ca.activity.isOptionalActivity() || ca.activity.isOptionsWithSequencesActivity()) {
+				ca.swapDepths(ca.depthHistory);
+				ca.depthHistory = null;
+			}
 			_canvasModel.isDragging = false;
 			
 			var sequenceActivity:Activity = _canvasModel.getCanvas().ddm.getActivityByUIID(ca.activity.parentUIID);