diff --git a/platypush/backend/http/webapp/src/components/elements/Dropdown.vue b/platypush/backend/http/webapp/src/components/elements/Dropdown.vue
index 879de35f38..e02f26d272 100644
--- a/platypush/backend/http/webapp/src/components/elements/Dropdown.vue
+++ b/platypush/backend/http/webapp/src/components/elements/Dropdown.vue
@@ -5,7 +5,7 @@
       <span class="text" v-text="text" v-if="text" />
     </button>
 
-    <div class="body-container hidden" ref="dropdownContainer">
+    <div class="body-container" :class="{ hidden: !visible }" ref="dropdownContainer">
       <DropdownBody :id="id"
                     :keepOpenOnItemClick="keepOpenOnItemClick"
                     :style="style"
@@ -143,7 +143,6 @@ export default {
         this.$el.appendChild(element)
 
       this.visible = true
-      this.$refs.dropdownContainer.classList.remove('hidden')
       this.$nextTick(this.adjustDropdownPos)
     },
 
@@ -179,7 +178,6 @@ export default {
       element.style.top = `${pos.top}px`
       element.style.left = `${pos.left}px`
       bus.emit('dropdown-open', this.$refs.dropdown)
-      this.$refs.dropdownContainer.classList.add('hidden')
     },
 
     toggle(event) {
diff --git a/platypush/backend/http/webapp/src/components/elements/DropdownContainer.vue b/platypush/backend/http/webapp/src/components/elements/DropdownContainer.vue
index a39455aeb9..f50b618a57 100644
--- a/platypush/backend/http/webapp/src/components/elements/DropdownContainer.vue
+++ b/platypush/backend/http/webapp/src/components/elements/DropdownContainer.vue
@@ -14,6 +14,7 @@ export default {
       if (!component.keepOpenOnItemClick)
         this.onClose()
 
+      component.$el.classList.remove('hidden')
       this.$el.appendChild(component.$el)
     },