diff --git a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
index af90cd37ce2f0a51c064e43592419286a89227bf..e642f100c7cd135c8cb95e5b4d6ad5830e80dc82 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
@@ -1173,7 +1173,7 @@ public class BaseFullWebappController extends BasicController implements DTabs,
 			}
 			doActivateDTab(dtabi);
 	
-			if(entries != null && !entries.isEmpty() && c instanceof Activateable2) {
+			if(c instanceof Activateable2) {
 				final Activateable2 activateable = ((Activateable2) c);
 				activateable.activate(ureq, entries, null);
 			}
diff --git a/src/main/java/org/olat/course/run/CourseRuntimeController.java b/src/main/java/org/olat/course/run/CourseRuntimeController.java
index 044ec3fd6dbe9c01d4afa86c822b4c4bb7a4f1a5..236d46b19f1f4acce578eb01fed1da5c987d5359 100644
--- a/src/main/java/org/olat/course/run/CourseRuntimeController.java
+++ b/src/main/java/org/olat/course/run/CourseRuntimeController.java
@@ -886,6 +886,19 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
 
 	@Override
 	public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
+		if(entries == null || entries.isEmpty()) {
+			if(currentToolCtr != null) {
+				addToHistory(ureq, currentToolCtr);
+			} else {
+				Controller runtimeCtrl = getRuntimeController();
+				if(runtimeCtrl instanceof Activateable2) {
+					((Activateable2)runtimeCtrl).activate(ureq, entries, state);
+				} else {
+					addToHistory(ureq, runtimeCtrl);
+				}
+			}
+			return;
+		}
 
 		entries = removeRepositoryEntry(entries);
 		if(entries != null && entries.size() > 0) {
diff --git a/src/main/java/org/olat/course/run/RunMainController.java b/src/main/java/org/olat/course/run/RunMainController.java
index 75842b3245cc5624b38bd2446cfce6a061a9042e..d2b680a66d3df5ee382080ffa03dab29a0547872 100644
--- a/src/main/java/org/olat/course/run/RunMainController.java
+++ b/src/main/java/org/olat/course/run/RunMainController.java
@@ -820,6 +820,11 @@ public class RunMainController extends MainLayoutBasicController implements Gene
 	@Override
 	public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
 		if(entries == null || entries.isEmpty()) {
+			if(currentNodeController != null) {
+				addToHistory(ureq, currentNodeController);
+			} else {
+				addToHistory(ureq, this);
+			}
 			return;
 		}
 		
diff --git a/src/main/java/org/olat/group/ui/homepage/GroupInfoMainController.java b/src/main/java/org/olat/group/ui/homepage/GroupInfoMainController.java
index 43fb231e3925c42fb54934075227040d12c78ea1..280d59c4934e51f3bfc315ae38b00d7a72475529 100644
--- a/src/main/java/org/olat/group/ui/homepage/GroupInfoMainController.java
+++ b/src/main/java/org/olat/group/ui/homepage/GroupInfoMainController.java
@@ -117,7 +117,10 @@ public class GroupInfoMainController extends MainLayoutBasicController implement
 
 	@Override
 	public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
-		if(entries == null || entries.isEmpty()) return;
+		if(entries == null || entries.isEmpty()) {
+			addToHistory(ureq);
+			return;
+		}
 		
 		ContextEntry entry = entries.get(0);
 		String menuItem = entry.getOLATResourceable().getResourceableTypeName();
diff --git a/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java b/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java
index 6c1b80b8c4c9aeb1a7650077a0f4c988df652261..d622a6b8426e3454eb8fe2c6aeb606bd6e878d6d 100644
--- a/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java
+++ b/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java
@@ -902,7 +902,13 @@ public class BusinessGroupMainRunController extends MainLayoutBasicController im
 
 	@Override
 	public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
-		if(entries == null || entries.isEmpty() || needActivation) return;
+		if(needActivation) {
+			return;
+		}
+		if(entries == null || entries.isEmpty()) {
+			addToHistory(ureq);
+			return;
+		}
 		
 		// release edit lock if available
 		removeAsListenerAndDispose(bgEditCntrllr);