diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue
index 81e821795..1acb4df60 100644
--- a/src/components/dialog/Dialog.vue
+++ b/src/components/dialog/Dialog.vue
@@ -1,7 +1,7 @@
 <template>
-    <div ref="mask" :class="wrapperClass" v-if="visible">
+    <div ref="mask" :class="wrapperClass" v-if="d_visible">
         <transition name="p-dialog" @enter="onEnter" @leave="onLeave" @appear="onAppear">
-            <div ref="container" :class="containerClass" :style="containerStyle" v-if="visible" v-bind="$attrs" v-on="listeners" role="dialog" :aria-labelledby="ariaLabelledById" :aria-modal="modal">
+            <div ref="container" :class="containerClass" :style="containerStyle" v-if="d_visible" v-bind="$attrs" v-on="listeners" role="dialog" :aria-labelledby="ariaLabelledById" :aria-modal="modal">
                 <div class="p-dialog-titlebar" v-if="showHeader">
                     <slot name="header">
                         <span :id="ariaLabelledById" class="p-dialog-title" v-if="header" >{{header}}</span>
@@ -57,10 +57,20 @@ export default {
             default: 'close'
         }
     },
+    watch: {
+        visible(newValue) {
+            this.d_visible = newValue;
+
+            if(!this.d_visible) {
+                this.disableModality()
+            }
+        }
+    },
     data() {
         return {
             dialogClasses: null,
-            dialogStyles: null
+            dialogStyles: null,
+            d_visible: this.visible
         }
     },
     documentKeydownListener: null,
@@ -82,7 +92,8 @@ export default {
     },
     methods: {
         close() {
-            this.$emit('update:visible', false);
+            this.d_visible = false;
+            this.$emit('update:visible', this.d_visible);
         },
         onEnter() {
             this.$emit('show');
@@ -100,7 +111,7 @@ export default {
             this.disableModality();
         },
         onAppear() {
-            if (this.visible) {
+            if (this.d_visible) {
                 this.onEnter();
             }
         },
@@ -341,4 +352,4 @@ export default {
     -webkit-transition: height .3s;
     transition: height .3s;
 }
-</style>
\ No newline at end of file
+</style>