diff --git a/packages/dialog/__tests__/dialog.spec.ts b/packages/dialog/__tests__/dialog.spec.ts
index b5ae7c7fc8..3f02671e68 100644
--- a/packages/dialog/__tests__/dialog.spec.ts
+++ b/packages/dialog/__tests__/dialog.spec.ts
@@ -230,5 +230,32 @@ describe('Dialog.vue', () => {
       await nextTick()
       expect(wrapper.find('.el-dialog__body').exists()).toBe(false)
     })
+
+    test('should emit close event', async () => {
+      let visible = true
+      const onClose = jest.fn()
+      const onClosed = jest.fn()
+      const wrapper = _mount({
+        props: {
+          modelValue: visible,
+          'onUpdate:modelValue': (val: boolean) => visible = val,
+          onClose,
+          onClosed,
+        },
+      })
+
+      expect(wrapper.vm.visible).toBe(true)
+      await nextTick()
+      await rAF()
+      await nextTick()
+
+      await wrapper.find('.el-overlay').trigger('click')
+      await nextTick()
+      await rAF()
+      await nextTick()
+      expect(onClose).toHaveBeenCalled()
+      expect(onClosed).toHaveBeenCalled()
+      expect(visible).toBe(false)
+    })
   })
 })
diff --git a/packages/dialog/src/index.vue b/packages/dialog/src/index.vue
index 6440a96739..c9236e9bab 100644
--- a/packages/dialog/src/index.vue
+++ b/packages/dialog/src/index.vue
@@ -4,6 +4,7 @@
       name="dialog-fade"
       @after-enter="afterEnter"
       @after-leave="afterLeave"
+      @before-leave="beforeLeave"
     >
       <el-overlay
         v-show="visible"
diff --git a/packages/dialog/src/useDialog.ts b/packages/dialog/src/useDialog.ts
index 063518deed..88946fd7f9 100644
--- a/packages/dialog/src/useDialog.ts
+++ b/packages/dialog/src/useDialog.ts
@@ -1,4 +1,4 @@
-import { computed, ref, watch, nextTick, onMounted, CSSProperties } from 'vue'
+import { computed, ref, watch, nextTick, onMounted } from 'vue'
 
 import isServer from '@element-plus/utils/isServer'
 import { UPDATE_MODEL_EVENT } from '@element-plus/utils/constants'
@@ -6,7 +6,7 @@ import PopupManager from '@element-plus/utils/popup-manager'
 import { clearTimer } from '@element-plus/utils/util'
 import { useLockScreen, useRestoreActive, useModal } from '@element-plus/hooks'
 
-import type { Ref } from 'vue'
+import type { Ref, CSSProperties } from 'vue'
 import type { SetupContext } from '@vue/runtime-core'
 import type { UseDialogProps } from './dialog'
 
@@ -49,6 +49,10 @@ export default function(props: UseDialogProps, ctx: SetupContext, targetRef: Ref
     }
   }
 
+  function beforeLeave() {
+    ctx.emit(CLOSE_EVENT)
+  }
+
   function open() {
     clearTimer(closeTimer)
     clearTimer(openTimer)
@@ -139,9 +143,8 @@ export default function(props: UseDialogProps, ctx: SetupContext, targetRef: Ref
       })
     } else {
       // this.$el.removeEventListener('scroll', this.updatePopper
-      close()
-      if (!closed.value) {
-        ctx.emit(CLOSE_EVENT)
+      if (visible.value) {
+        close()
       }
     }
   })
@@ -157,6 +160,7 @@ export default function(props: UseDialogProps, ctx: SetupContext, targetRef: Ref
   return {
     afterEnter,
     afterLeave,
+    beforeLeave,
     handleClose,
     onModalClick,
     closed,
diff --git a/packages/drawer/__tests__/drawer.spec.ts b/packages/drawer/__tests__/drawer.spec.ts
index 9de0170006..748ac1c679 100644
--- a/packages/drawer/__tests__/drawer.spec.ts
+++ b/packages/drawer/__tests__/drawer.spec.ts
@@ -88,9 +88,12 @@ describe('Drawer', () => {
   })
 
   test('should open and close drawer properly', async () => {
+    const onClose = jest.fn()
+    const onClosed = jest.fn()
+    const onOpened = jest.fn()
     const wrapper = _mount(
       `
-      <el-drawer :title='title' v-model='visible'>
+      <el-drawer :title='title' v-model='visible' @closed="onClosed" @close="onClose" @opened="onOpened">
         <span>${content}</span>
       </el-drawer>
       `,
@@ -98,18 +101,34 @@ describe('Drawer', () => {
         title,
         visible: false,
       }),
+      {
+        methods: {
+          onOpened,
+          onClose,
+          onClosed,
+        },
+      },
     )
     const vm = wrapper.vm as any
     await nextTick()
     await rAF()
     await nextTick()
+    expect(onOpened).not.toHaveBeenCalled()
 
     const drawerEl = wrapper.find('.el-overlay').element as HTMLDivElement
     expect(drawerEl.style.display).toEqual('none')
 
     vm.visible = true
     await nextTick()
+    await rAF()
     expect(drawerEl.style.display).not.toEqual('none')
+    expect(onOpened).toHaveBeenCalled()
+
+    // vm.visible = false
+    // await nextTick()
+    // await rAF()
+    // await nextTick()
+    // expect(onClose).toHaveBeenCalled()
   })
 
   test('should destroy every child after drawer was closed when destroy-on-close flag is true', async () => {
diff --git a/packages/drawer/src/index.vue b/packages/drawer/src/index.vue
index 1422091309..6ebdd4d95f 100644
--- a/packages/drawer/src/index.vue
+++ b/packages/drawer/src/index.vue
@@ -4,6 +4,7 @@
       name="el-drawer-fade"
       @after-enter="afterEnter"
       @after-leave="afterLeave"
+      @before-leave="beforeLeave"
     >
       <el-overlay
         v-show="visible"
diff --git a/packages/overlay/__tests__/overlay.spec.ts b/packages/overlay/__tests__/overlay.spec.ts
index eb364cf779..c9069eb7f1 100644
--- a/packages/overlay/__tests__/overlay.spec.ts
+++ b/packages/overlay/__tests__/overlay.spec.ts
@@ -42,5 +42,9 @@ describe('Overlay.vue', () => {
       mask: false,
     })
     expect(wrapper.find(selector).exists()).toBe(false)
+    await wrapper.setProps({
+      mask: true,
+    })
+    expect(wrapper.find(selector).exists()).toBe(true)
   })
 })
diff --git a/packages/overlay/src/index.vue b/packages/overlay/src/index.vue
index e3efde80ab..ea7cc5723d 100644
--- a/packages/overlay/src/index.vue
+++ b/packages/overlay/src/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { createVNode, defineComponent, renderSlot } from 'vue'
+import { createVNode, defineComponent, renderSlot, h } from 'vue'
 import { PatchFlags } from '@element-plus/utils/vnode'
 
 export default defineComponent({
@@ -23,6 +23,8 @@ export default defineComponent({
     }
     // init here
     return () => {
+      // when the vnode meets the same structure but with different change trigger
+      // it will not automatically update, thus we simply use h function to manage updating
       return props.mask
         ? createVNode(
           'div',
@@ -37,7 +39,16 @@ export default defineComponent({
           PatchFlags.STYLE | PatchFlags.CLASS | PatchFlags.PROPS,
           ['onClick'],
         )
-        : renderSlot(slots, 'default')
+        : h('div', {
+          style: {
+            zIndex: props.zIndex,
+            position: 'fixed',
+            top: '0px',
+            right: '0px',
+            bottom: '0px',
+            left: '0px',
+          },
+        }, [renderSlot(slots, 'default')])
     }
   },
 })