diff --git a/js/src/modal.js b/js/src/modal.js
index ec1991da0..ce2f33011 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -484,6 +484,10 @@ class Modal {
 
       // Adjust fixed content padding
       $(fixedContent).each((index, element) => {
+        if (this._isShorterThanWindow(element)) {
+          return
+        }
+
         const actualPadding = element.style.paddingRight
         const calculatedPadding = $(element).css('padding-right')
         $(element)
@@ -493,6 +497,10 @@ class Modal {
 
       // Adjust sticky content margin
       $(stickyContent).each((index, element) => {
+        if (this._isShorterThanWindow(element)) {
+          return
+        }
+
         const actualMargin = element.style.marginRight
         const calculatedMargin = $(element).css('margin-right')
         $(element)
@@ -544,6 +552,10 @@ class Modal {
     return scrollbarWidth
   }
 
+  _isShorterThanWindow(element) {
+    return window.innerWidth > element.clientWidth + this._scrollbarWidth
+  }
+
   // Static
 
   static _jQueryInterface(config, relatedTarget) {