Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rbce900581d305102c2ffae96cf1a4a55f0a42706 -r8244a03cf7ddb093702015194be8450bd9205783
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rbce900581d305102c2ffae96cf1a4a55f0a42706 -r8244a03cf7ddb093702015194be8450bd9205783
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rf8aec012e83bbe15c9f193343942a03e1b11c095 -r8244a03cf7ddb093702015194be8450bd9205783
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision f8aec012e83bbe15c9f193343942a03e1b11c095)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 8244a03cf7ddb093702015194be8450bd9205783)
@@ -278,7 +278,8 @@
 				} // Following is validation for non-tool activities being dropped into the reference activity container which we don't want.
 			} else if (referenceOnCanvas != null && 
 				ca.hitTest(referenceOnCanvas) && 
-				(ca.activity.activityUIID != referenceOnCanvas.activity.activityUIID)) {
+				(ca.activity.activityUIID != referenceOnCanvas.activity.activityUIID) &&
+				 (_canvasModel.activeView instanceof CanvasView)) {
 				
 				if ( !(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE) ) {
 					activitySnapBack(ca);