diff --git a/webapp/components/Dropdown.vue b/webapp/components/Dropdown.vue
index 7c81e2aaa..3faa1824d 100644
--- a/webapp/components/Dropdown.vue
+++ b/webapp/components/Dropdown.vue
@@ -6,6 +6,7 @@
     :disabled="disabled"
     trigger="manual"
     :offset="offset"
+    @auto-hide="isPopoverOpen = false"
   >
     <slot :toggleMenu="toggleMenu" :openMenu="openMenu" :closeMenu="closeMenu" :isOpen="isOpen" />
     <div slot="popover" @mouseover="popoverMouseEnter" @mouseleave="popoverMouseLeave">
@@ -55,6 +56,10 @@ export default {
   beforeDestroy() {
     clearTimeout(mouseEnterTimer)
     clearTimeout(mouseLeaveTimer)
+    if (this.isPopoverOpen) {
+      this.isPopoverOpen = false
+      document.body.classList.remove('dropdown-open')
+    }
   },
   methods: {
     toggleMenu() {