diff --git a/components/lib/base/Base.js b/components/lib/base/Base.js
index df8d053fed..8798c8fdbb 100644
--- a/components/lib/base/Base.js
+++ b/components/lib/base/Base.js
@@ -19,6 +19,7 @@ const styles = `
 
 .p-overflow-hidden {
     overflow: hidden;
+    padding-right: var(--scrollbar-width);
 }
 `;
 
diff --git a/components/lib/dialog/Dialog.vue b/components/lib/dialog/Dialog.vue
index fcb1e826dc..84204b83d8 100755
--- a/components/lib/dialog/Dialog.vue
+++ b/components/lib/dialog/Dialog.vue
@@ -213,11 +213,13 @@ export default {
         enableDocumentSettings() {
             if (this.modal || (!this.modal && this.blockScroll) || (this.maximizable && this.maximized)) {
                 DomHandler.addClass(document.body, 'p-overflow-hidden');
+                document.body.style.setProperty('--scrollbar-width', DomHandler.calculateScrollbarWidth() + 'px');
             }
         },
         unbindDocumentState() {
             if (this.modal || (!this.modal && this.blockScroll) || (this.maximizable && this.maximized)) {
                 DomHandler.removeClass(document.body, 'p-overflow-hidden');
+                document.body.style.removeProperty('--scrollbar-width');
             }
         },
         onKeyDown(event) {