From e1d1166f1f2c3a4bf6447dbee91e29537cb9dd6d Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Thu, 22 Jun 2023 12:57:31 +0000
Subject: [PATCH] fix #1866

Closes #1866

Merge request studip/studip!1837
---
 .../vue/components/courseware/CoursewareRibbonToolbar.vue  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/resources/vue/components/courseware/CoursewareRibbonToolbar.vue b/resources/vue/components/courseware/CoursewareRibbonToolbar.vue
index 08da42a63da..795b6fadf98 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);
             }
-- 
GitLab