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.31.2.6 -r1.31.2.7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	11 May 2016 07:07:36 -0000	1.31.2.6
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	10 Aug 2016 14:02:24 -0000	1.31.2.7
@@ -224,7 +224,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());
 	}