Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java,v
diff -u -r1.78 -r1.79
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	13 Jan 2009 07:00:31 -0000	1.78
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	17 Feb 2009 01:51:53 -0000	1.79
@@ -1163,11 +1163,11 @@
     }
     
     public boolean isFloating() {
-    	if(parentActivity != null) {
-    		return parentActivity.isFloatingActivity();
+    	if(parentActivity == null){
+    		return false;
     	}
     	
-    	return false;
+    	return (parentActivity.isFloatingActivity()) ? true : parentActivity.isFloating();
     }
 
 }
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java,v
diff -u -r1.35 -r1.36
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	3 Mar 2008 04:40:35 -0000	1.35
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	17 Feb 2009 01:51:52 -0000	1.36
@@ -355,12 +355,15 @@
     	String closeWindowURLAction =  activityMappingStrategy.getCloseWindowAction();    
 
 		// Always calculate the url for the "normal" next case as we won't know till we reach the close window if we need it.
-		String action = getDisplayActivityAction(lessonId);
+		
+    	String action = getDisplayActivityAction(lessonId);
 		action = strutsActionToURL(action,null,true);
 		action = WebUtil.appendParameterToURL(action, DisplayActivityAction.PARAM_INITIAL_DISPLAY, "false");
 		action = URLEncoder.encode(action, "UTF-8");
-    	closeWindowURLAction = WebUtil.appendParameterToURL(closeWindowURLAction, "nextURL", action);
     	
+		if(!justCompletedActivity.isFloating())
+			closeWindowURLAction = WebUtil.appendParameterToURL(closeWindowURLAction, "nextURL", action);
+    	
   		// If we are in the parallel frameset then we might need the nextURL, or we might need the "waiting" url.
     	if ( justCompletedActivity.getParentActivity() != null && justCompletedActivity.getParentActivity().isParallelActivity() ) {
     		action = getActivityMappingStrategy().getWaitingAction();
Index: lams_learning/web/close.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/close.jsp,v
diff -u -r1.5 -r1.6
--- lams_learning/web/close.jsp	8 Feb 2009 23:52:54 -0000	1.5
+++ lams_learning/web/close.jsp	17 Feb 2009 01:51:52 -0000	1.6
@@ -32,9 +32,11 @@
               close the parent if you want to close the window. Live with two "close" messages for now. Eventually we 
 	      want to display the wait for the first one, and then close on the second. For that we will need
               location.href = "<c:out value="${param.waitURL}" escapeXml="false"/>"; --%>
-        } else if ( window.parent.name != "LearnerActivity" ) {
+        } else if ( window.parent.name != "LearnerActivity" ) {        	
         	<%-- In the main learner window, so want to continue with the main progress --%>
-            location.href = "<c:out value="${param.nextURL}" escapeXml="false"/>";
+        	<c:if test="${param.nextURL != null}">
+            	location.href = "<c:out value="${param.nextURL}" escapeXml="false"/>";
+            </c:if>
         }
     }
     window.onload = doCloseRedirect;