Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rd100f9edeabdfbba5c689674da620058c1a96178
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision d100f9edeabdfbba5c689674da620058c1a96178)
@@ -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());
 	}