diff --git a/api-generator/components/dialog.js b/api-generator/components/dialog.js
index 3f34c3254..066f1320d 100644
--- a/api-generator/components/dialog.js
+++ b/api-generator/components/dialog.js
@@ -138,6 +138,10 @@ const DialogEvents = [
         name: "hide",
         description: "Callback to invoke when dialog is hidden."
     },
+    {
+        name: "after-hide",
+        description: "Callback to invoke after dialog is hidden."
+    },
     {
         name: "show",
         description: "Callback to invoke when dialog is showed."
diff --git a/src/components/dialog/Dialog.d.ts b/src/components/dialog/Dialog.d.ts
index f39fe354f..111a2e410 100755
--- a/src/components/dialog/Dialog.d.ts
+++ b/src/components/dialog/Dialog.d.ts
@@ -154,11 +154,15 @@ export declare type DialogEmits = {
     /**
      * Callback to invoke when dialog is hidden.
      */
-    'show': () => void;
-    /**
-     * Callback to invoke when dialog is showed.
-     */
     'hide': () => void;
+    /**
+     * Callback to invoke after dialog is hidden.
+    */
+    'after-hide': () => void;
+    /**
+     * Callback to invoke when dialog is shown.
+     */
+    'show': () => void;
     /**
      * Fired when a dialog gets maximized.
      * @param {event} event - Browser event.
diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue
index 2d1f6c885..e3e434a5f 100755
--- a/src/components/dialog/Dialog.vue
+++ b/src/components/dialog/Dialog.vue
@@ -29,14 +29,15 @@
 </template>
 
 <script>
-import {UniqueComponentId,DomHandler,ZIndexUtils} from 'primevue/utils';
+import { computed } from 'vue';
+import { UniqueComponentId,DomHandler,ZIndexUtils } from 'primevue/utils';
 import Ripple from 'primevue/ripple';
 import Portal from 'primevue/portal';
 
 export default {
     name: 'Dialog',
     inheritAttrs: false,
-    emits: ['update:visible','show','hide','maximize','unmaximize','dragend'],
+    emits: ['update:visible','show','hide', 'after-hide', 'maximize','unmaximize','dragend'],
     props: {
         header: null,
         footer: null,
@@ -98,6 +99,12 @@ export default {
         appendTo: {
             type: String,
             default: 'body'
+        },
+        _instance: null
+    },
+    provide() {
+        return {
+            dialogRef: computed(() => this._instance)
         }
     },
     data() {
@@ -125,12 +132,11 @@ export default {
         this.unbindGlobalListeners();
         this.destroyStyle();
 
-        this.mask = null;
-
-        if (this.container && this.autoZIndex) {
-            ZIndexUtils.clear(this.container);
+        if (this.mask && this.autoZIndex) {
+            ZIndexUtils.clear(this.mask);
         }
         this.container = null;
+        this.mask = null;
     },
     mounted() {
         if (this.breakpoints) {
@@ -142,19 +148,17 @@ export default {
             this.$emit('update:visible', false);
         },
         onBeforeEnter(el) {
-            if (this.autoZIndex) {
-                ZIndexUtils.set('modal', el, this.baseZIndex + this.$primevue.config.zIndex.modal);
-            }
-
             el.setAttribute(this.attributeSelector, '');
         },
         onEnter() {
-            this.mask.style.zIndex = String(parseInt(this.container.style.zIndex, 10) - 1);
-
             this.$emit('show');
             this.focus();
             this.enableDocumentSettings();
             this.bindGlobalListeners();
+
+            if (this.autoZIndex) {
+                ZIndexUtils.set('modal', this.mask, this.baseZIndex + this.$primevue.config.zIndex.modal);
+            }
         },
         onBeforeLeave() {
             if (this.modal) {
@@ -162,16 +166,16 @@ export default {
             }
         },
         onLeave() {
-
             this.$emit('hide');
         },
-        onAfterLeave(el) {
+        onAfterLeave() {
             if (this.autoZIndex) {
-                ZIndexUtils.clear(el);
+                ZIndexUtils.clear(this.mask);
             }
             this.containerVisible = false;
             this.unbindDocumentState();
             this.unbindGlobalListeners();
+            this.$emit('after-hide');
         },
         onMaskClick(event) {
             if (this.dismissableMask && this.closable && this.modal && this.mask === event.target) {
diff --git a/src/views/dialog/DialogDoc.vue b/src/views/dialog/DialogDoc.vue
index 5c3f4f710..eda16c67e 100755
--- a/src/views/dialog/DialogDoc.vue
+++ b/src/views/dialog/DialogDoc.vue
@@ -254,6 +254,11 @@ export default {
                         <td>-</td>
                         <td>Callback to invoke when dialog is hidden.</td>
                     </tr>
+                    <tr>
+                        <td>after-hide</td>
+                        <td>-</td>
+                        <td>Callback to invoke after dialog is hidden.</td>
+                    </tr>
                     <tr>
                         <td>show</td>
                         <td>-</td>