Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -re63c1c483f1b6d20067a719c29d36151fe13126a -r471a9703a083f8a36f111ec7be0a18d285942afb
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision e63c1c483f1b6d20067a719c29d36151fe13126a)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 471a9703a083f8a36f111ec7be0a18d285942afb)
@@ -1510,13 +1510,18 @@
 	 * Finds activity/region this shape is bound with.
 	 */
 	getParentObject : function(item) {
-		var parentObject = item.data('parentObject');
-		if (!parentObject) {
-			var parentNode = item.parent();
-			if (parentNode.type == 'g') {
-				parentObject = parentNode.data('parentObject');
+		var parentObject = null;
+		
+		while (!parentObject) {
+			parentObject = item.data('parentObject');
+			if (!parentObject) {
+				item = item.parent();
+				if (!item || item.attr('id') == 'canvas') {
+					break;
+				}
 			}
 		}
+		
 		return parentObject;
 	},
 	
Index: lams_central/web/includes/javascript/authoring/authoringHandler.js
===================================================================
diff -u -r770004eb10d23298f103767a30bae3175b43e2e3 -r471a9703a083f8a36f111ec7be0a18d285942afb
--- lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision 770004eb10d23298f103767a30bae3175b43e2e3)
+++ lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision 471a9703a083f8a36f111ec7be0a18d285942afb)
@@ -745,9 +745,6 @@
 		if (targetElement) {
 			endActivity = ActivityLib.getParentObject(targetElement);
 		}
-		if (endActivity == null) {
-			endActivity = ActivityLib.getParentObject(targetElement.parent());
-		}
 
 		if (endActivity && activity != endActivity) {
 			ActivityLib.addTransition(activity, endActivity);