Index: lams_central/web/authoringConfirm.jsp
===================================================================
diff -u -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3 -r529eefb35bded3cfe968dc9e83e5c32fe192a9a8
--- lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
+++ lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 529eefb35bded3cfe968dc9e83e5c32fe192a9a8)
@@ -13,7 +13,7 @@
 	<script type="text/javascript">
 		function closeWindow() {
 			if (window.parent.ActivityLib) {
-				window.parent.ActivityLib.closeActivityAuthoring();
+				window.parent.ActivityLib.closeActivityAuthoring(window.frameElement.id);
 				return;
 			}
 
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -rd34cc270cb398c4db6fe2b8a04e09bbce8cf76ce -r529eefb35bded3cfe968dc9e83e5c32fe192a9a8
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision d34cc270cb398c4db6fe2b8a04e09bbce8cf76ce)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 529eefb35bded3cfe968dc9e83e5c32fe192a9a8)
@@ -1144,8 +1144,8 @@
 	 * It is run from authoringConfirm.jsp
 	 * It closes the dialog with activity authoring 
 	 */
-	closeActivityAuthoring : function(){
-		$("#dialogActivity").off('hide.bs.modal').on('hide.bs.modal', function(){
+	closeActivityAuthoring : function(dialogID){
+		$("#" + dialogID).off('hide.bs.modal').on('hide.bs.modal', function(){
 			$('iframe', this).attr('src', null);
 		}).modal('hide');
 	},
@@ -1387,7 +1387,8 @@
 		}
 		
 		if (activity.authorURL) {
-			showDialog("dialogActivity", {
+			var dialogID = "dialogActivity" + activity.toolContentID;
+			showDialog(dialogID, {
 				'height' : Math.max(300, $(window).height() - 30),
 				'width' :  Math.max(380, Math.min(1024, $(window).width() - 60)),
 				'draggable' : true,
@@ -1410,13 +1411,11 @@
 				'open' : function() {
 					var dialog = $(this);
 					// load contents after opening the dialog
-					$('iframe', dialog).attr('id','iframeForActivity').attr('src', activity.authorURL).load(function(){
+					$('iframe', dialog).attr('id', dialogID).attr('src', activity.authorURL).load(function(){
 						// override the close function so it works with the dialog, not window
 						this.contentWindow.closeWindow = function(){
 							// detach the 'beforeClose' handler above, attach the standard one and close the dialog
-							dialog.off('hide.bs.modal').on('hide.bs.modal', function(){
-								$('iframe', this).attr('src', null);
-							}).modal('hide');
+							ActivityLib.closeActivityAuthoring(dialogID);
 						}
 					});
 				}