diff --git a/resources/vue/components/courseware/CoursewareBlockEdit.vue b/resources/vue/components/courseware/CoursewareBlockEdit.vue
index 3e9c00e8cac24351fce32fc991d6f0fd532caa0e..68934cbde516916a77e2c522d782b6f232c6e17f 100755
--- a/resources/vue/components/courseware/CoursewareBlockEdit.vue
+++ b/resources/vue/components/courseware/CoursewareBlockEdit.vue
@@ -28,6 +28,7 @@ export default {
     },
     methods: {
         deactivateToolbar() {
+            this.$store.dispatch('coursewareBlockAdder', {});
             this.$store.dispatch('coursewareShowToolbar', false);
         },
     },
diff --git a/resources/vue/components/courseware/CoursewareRibbonToolbar.vue b/resources/vue/components/courseware/CoursewareRibbonToolbar.vue
index 5f3e3c2085dba2cc1cc575c11c3f2c87e3b0d136..b65fafdd209f9063f71d9a4ff909d06de3591795 100755
--- a/resources/vue/components/courseware/CoursewareRibbonToolbar.vue
+++ b/resources/vue/components/courseware/CoursewareRibbonToolbar.vue
@@ -1,5 +1,5 @@
 <template>
-    <focus-trap v-model="trap" :initial-focus="() => initialFocusElement">
+    <focus-trap v-model="trap" :initial-focus="() => initialFocusElement" :clickOutsideDeactivates="true">
         <div
             class="cw-ribbon-tools"
             :class="{ unfold: toolsActive, 'cw-ribbon-tools-consume': consumeMode }"