diff --git a/src/bootstrap-modal-popover.js b/src/bootstrap-modal-popover.js
index 9e7459f..6a61145 100644
--- a/src/bootstrap-modal-popover.js
+++ b/src/bootstrap-modal-popover.js
@@ -6,6 +6,7 @@
     var ModalPopover = function (element, options) {
         this.options = options;
         this.$body = $(document.body);
+        this.$navbar = $('.navbar.navbar-fixed-top');
         this.$element = $(element)
             .delegate('[data-dismiss="modal-popup"]', 'click.dismiss.modal-popup', $.proxy(this.hide, this));
         this.$dialog = this.$element.find('.modal-dialog');
@@ -90,6 +91,10 @@
                     this.$backdrop.one($.support.transition.end, callback) :
                     callback()
 
+                if (that.bodyIsOverflowing) {
+                    this.$navbar.css({ paddingRight: that.scrollbarWidth });
+                };
+
             } else if (!this.isShown && this.$backdrop) {
                 this.$backdrop.removeClass('in');
 
@@ -99,6 +104,9 @@
 
                 this.$body.removeClass('modal-open');
 
+                this.$navbar.css({ paddingRight: 0 });
+                this.$body.css({paddingRight: 0});
+
             } else if (callback) {
                 callback()
             }