diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38e75aae8..f282c8858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,8 @@ All notable changes to this project will be documented in this file. The format
   current item's about page.
 - Made links clickable in the description of objects, key results and goals.
 - It is no longer possible to close open modals or drawers by clicking outside
-  them. This is meant to prevent accidental data loss in unsaved forms.
+  them. This is meant to prevent accidental data loss in unsaved forms. Drawers
+  can however still be closed by outside click after form submission.
 - Items in the admin panel now links directly to each respective item about page
   with the edit drawer opened.
 - The currently active item tab is now kept when navigating between
diff --git a/src/components/drawers/PagedDrawerWrapper.vue b/src/components/drawers/PagedDrawerWrapper.vue
index 26912aba2..814d58166 100644
--- a/src/components/drawers/PagedDrawerWrapper.vue
+++ b/src/components/drawers/PagedDrawerWrapper.vue
@@ -8,6 +8,7 @@
     ]"
     @close="$emit('close')"
     @hidden="reset"
+    @click-outside="clickOutside"
   >
     <template #header>
       <span
@@ -105,6 +106,12 @@ export default {
       this.skin = null;
       this.pageIndex = 1;
     },
+
+    clickOutside(e) {
+      if (this.isDone) {
+        this.$emit('close', e);
+      }
+    },
   },
 };
 </script>
diff --git a/src/components/drawers/SliderContainer.vue b/src/components/drawers/SliderContainer.vue
index 13fe04c23..44447768e 100644
--- a/src/components/drawers/SliderContainer.vue
+++ b/src/components/drawers/SliderContainer.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <transition name="fade" mode="out-in">
-      <div v-if="visible" class="overlay"></div>
+      <div v-if="visible" class="overlay" @click.self="$emit('click-outside')"></div>
     </transition>
     <transition name="slide" @after-leave="$emit('hidden')">
       <aside v-if="visible" class="sliderContainer">