diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue
index 8b2dfc92e..48ff3f439 100644
--- a/src/components/calendar/Calendar.vue
+++ b/src/components/calendar/Calendar.vue
@@ -1809,9 +1809,9 @@ export default {
             else {
                 cell = DomHandler.findSingle(this.$refs.overlay, 'span.p-highlight');
                 if (!cell) {
-                    let todayCell = DomHandler.findSingle(this.$refs.overlay, 'td.p-datepicker-today');
+                    let todayCell = DomHandler.findSingle(this.$refs.overlay, 'td.p-datepicker-today span:not(.p-disabled)');
                     if (todayCell)
-                        cell = todayCell.children[0];
+                        cell = todayCell;
                     else
                         cell = DomHandler.findSingle(this.$refs.overlay, '.p-datepicker-calendar td span:not(.p-disabled)');
                 }
diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue
index 81e821795..9e015d162 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 || blockScroll">
         <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>
@@ -60,7 +60,21 @@ export default {
     data() {
         return {
             dialogClasses: null,
-            dialogStyles: null
+            dialogStyles: null,
+            d_visible: this.visible,
+            blockScroll: false,
+        }
+    },
+    watch: {
+        visible(newValue) {
+            this.d_visible = newValue;
+
+            if(this.d_visible && this.modal) {
+                this.blockScroll = true;
+            }
+            else {
+                Promise.resolve(null).then(() => this.blockScroll = false);
+            }
         }
     },
     documentKeydownListener: null,
@@ -82,7 +96,9 @@ 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 +116,7 @@ export default {
             this.disableModality();
         },
         onAppear() {
-            if (this.visible) {
+            if (this.d_visible) {
                 this.onEnter();
             }
         },
@@ -341,4 +357,4 @@ export default {
     -webkit-transition: height .3s;
     transition: height .3s;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 54158ff80..a5f7a245a 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -56,7 +56,7 @@
                         <img alt="accesibility" src="../assets/images/home/vue-accesibility.png" />
                         <div class="feature-card-detail">
                             <span class="feature-name">ACCESSIBILITY</span>
-                            <p>Fully accessible and in complaince with Section 508 standards.</p>
+                            <p>Fully accessible and in compliance with Section 508 standards.</p>
                         </div>
                     </div>
                 </div>