diff --git a/resources/vue/components/courseware/CoursewareRibbonToolbar.vue b/resources/vue/components/courseware/CoursewareRibbonToolbar.vue
index 08da42a63da07509698a1f42b62bbae66a947963..795b6fadf98544f3b49fc9bd6c94f3e2fab2c56a 100644
--- a/resources/vue/components/courseware/CoursewareRibbonToolbar.vue
+++ b/resources/vue/components/courseware/CoursewareRibbonToolbar.vue
@@ -126,7 +126,7 @@ export default {
             return this.userIsTeacher;
         },
         fallbackFocusElement(){
-            return this.$refs.tabs.getTabButtonByAlias(this.selectedToolbarItem);
+            return this.$refs.contents;
         }
     },
     methods: {
@@ -193,9 +193,10 @@ export default {
             }
         },
         toolsActive(newValue) {
-            if (newValue) {
+            const focusElement = this.$refs.tabs.getTabButtonByAlias(this.selectedToolbarItem);
+            if (newValue && focusElement) {
                 setTimeout(() => {
-                    this.initialFocusElement = this.$refs.tabs.getTabButtonByAlias(this.selectedToolbarItem);
+                    this.initialFocusElement = focusElement;
                     this.trap = true;
                 }, 300);
             }