Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java,v
diff -u -r1.36 -r1.37
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	11 May 2016 07:29:25 -0000	1.36
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	10 Aug 2016 14:00:12 -0000	1.37
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.learning.web.util;
 
 import java.io.UnsupportedEncodingException;
@@ -222,7 +221,6 @@
 	if (currentActivity == null) {
 	    progress = learnerService.joinLesson(learnerId, lesson.getLessonId());
 	} else if (progress.getCompletedActivities().containsKey(currentActivity)) {
-
 	    // recalculate activity mark and pass it to gradebook
 	    learnerService.updateGradebookMark(currentActivity, progress);
 
@@ -231,7 +229,8 @@
 	    progress = learnerService.completeActivity(learnerId, currentActivity, progress);
 	}
 
-	if ((currentActivity != null) && currentActivity.isFloating()) {
+	if (currentActivity != null && (currentActivity.isFloating() || (currentActivity.getParentActivity() != null
+		&& progress.getCompletedActivities().containsKey(currentActivity.getParentActivity())))) {
 	    return actionMappings.getCloseForward(currentActivity, lesson.getLessonId());
 	}