diff --git a/resources/vue/components/courseware/layouts/CoursewareTabs.vue b/resources/vue/components/courseware/layouts/CoursewareTabs.vue
index c29d88e64f1dbcc8fb0eee6ce46d41fa5cbba5b7..dec9ed006631fa8ace42be7e3e6e4f7b685d1827 100644
--- a/resources/vue/components/courseware/layouts/CoursewareTabs.vue
+++ b/resources/vue/components/courseware/layouts/CoursewareTabs.vue
@@ -76,6 +76,9 @@ export default {
                     break;
             }
         },
+        getActiveTabElement() {
+            return this.$refs['tabnav' + this.activeTab][0];
+        },
     },
     provide() {
         return {
diff --git a/resources/vue/components/courseware/structural-element/CoursewareRibbonToolbar.vue b/resources/vue/components/courseware/structural-element/CoursewareRibbonToolbar.vue
index 9af7a490b3f598f7c90d1ea22e984cdd3dd2b40d..a69af1d3ae265bcd78aeff3aed6fcba4a2870d11 100644
--- a/resources/vue/components/courseware/structural-element/CoursewareRibbonToolbar.vue
+++ b/resources/vue/components/courseware/structural-element/CoursewareRibbonToolbar.vue
@@ -85,7 +85,6 @@ export default {
             context: 'context',
             userById: 'users/byId',
             userId: 'userId',
-            selectedToolbarItem: 'selectedToolbarItem',
             currentElementisLink: 'currentElementisLink',
         }),
         isTeacher() {
@@ -107,7 +106,7 @@ export default {
             }
         },
         activate() {
-            const focusElement = this.$refs.tabs.getTabButtonByAlias(this.selectedToolbarItem);
+            const focusElement = this.$refs.tabs.getActiveTabElement();
             if (focusElement) {
                 this.initialFocusElement = focusElement;
                 this.trap = true;