diff --git a/src/main/java/org/olat/core/gui/components/tabbedpane/TabbedPane.java b/src/main/java/org/olat/core/gui/components/tabbedpane/TabbedPane.java
index 4973ac1828152782bb1506d0b552b689e6fe84b2..e2b13e656285a223b415230597ecc3fb1499b998 100644
--- a/src/main/java/org/olat/core/gui/components/tabbedpane/TabbedPane.java
+++ b/src/main/java/org/olat/core/gui/components/tabbedpane/TabbedPane.java
@@ -260,10 +260,13 @@ public class TabbedPane extends Container implements Activateable2 {
 	@Override
 	public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
 		if(entries == null || entries.isEmpty()) return;
-
-		int pos = entries.get(0).getOLATResourceable().getResourceableId().intValue();
-		if(pos != selectedPane) {
-			dispatchRequest(ureq, pos);
+		
+		OLATResourceable ores = entries.get(0).getOLATResourceable();
+		if("tab".equals(ores.getResourceableTypeName())) {
+			int pos = ores.getResourceableId().intValue();
+			if(pos != selectedPane && pos >= 0 && pos < getTabCount()) {
+				dispatchRequest(ureq, pos);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/org/olat/group/ui/edit/BusinessGroupEditController.java b/src/main/java/org/olat/group/ui/edit/BusinessGroupEditController.java
index b8561fcb7b9d7ae727a7ffc13cdf6de5e70e44b3..0407035799f9492a524ec4425618ec6f5a4c6824 100644
--- a/src/main/java/org/olat/group/ui/edit/BusinessGroupEditController.java
+++ b/src/main/java/org/olat/group/ui/edit/BusinessGroupEditController.java
@@ -317,7 +317,6 @@ public class BusinessGroupEditController extends BasicController implements Cont
 	}
 	
 	@Override
-	//fxdiff BAKS-7 Resume function
 	public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
 		if(entries == null || entries.isEmpty() || tabbedPane == null) return;
 		tabbedPane.activate(ureq, entries, state);