diff --git a/src/elements/emby-scroller/emby-scroller.scss b/src/elements/emby-scroller/emby-scroller.scss
index b02fb00096..ad2fdf54cf 100644
--- a/src/elements/emby-scroller/emby-scroller.scss
+++ b/src/elements/emby-scroller/emby-scroller.scss
@@ -3,10 +3,10 @@
 }
 
 .emby-scroller {
-    margin-left: 3.3%;
-    margin-left: max(env(safe-area-inset-left), 3.3%);
-    margin-right: 3.3%;
-    margin-right: max(env(safe-area-inset-right), 3.3%);
+    padding-left: 3.3%;
+    padding-left: max(env(safe-area-inset-left), 3.3%);
+    padding-right: 3.3%;
+    padding-right: max(env(safe-area-inset-right), 3.3%);
 }
 
 .servers > .card > .cardBox {
@@ -26,13 +26,3 @@
         margin-left: 1.2em;
     }
 }
-
-.layout-tv .emby-scroller,
-.layout-mobile .emby-scroller {
-    padding-left: 3.3%;
-    padding-left: max(env(safe-area-inset-left), 3.3%);
-    padding-right: 3.3%;
-    padding-right: max(env(safe-area-inset-right), 3.3%);
-    margin-left: 0;
-    margin-right: 0;
-}
diff --git a/src/libraries/scroller.js b/src/libraries/scroller.js
index 01038fa0b4..12edc468cc 100644
--- a/src/libraries/scroller.js
+++ b/src/libraries/scroller.js
@@ -175,11 +175,19 @@ const scrollerFactory = function (frame, options) {
             requiresReflow = false;
 
             // Reset global variables
-            frameSize = o.horizontal ? (frame).offsetWidth : (frame).offsetHeight;
+            const frameStyle = window.getComputedStyle(frame);
+            if (o.horizontal) {
+                frameSize = frame.clientWidth;
+                frameSize -= parseFloat(frameStyle.paddingLeft) + parseFloat(frameStyle.paddingRight);
+            } else {
+                frameSize = frame.clientHeight;
+                frameSize -= parseFloat(frameStyle.paddingTop) + parseFloat(frameStyle.paddingBottom);
+            }
+            frameSize = Math.round(frameSize);
 
             slideeSize = o.scrollWidth || Math.max(slideeElement[o.horizontal ? 'offsetWidth' : 'offsetHeight'], slideeElement[o.horizontal ? 'scrollWidth' : 'scrollHeight']);
 
-            // Set position limits & relativess
+            // Set position limits & relatives
             self._pos.end = Math.max(slideeSize - frameSize, 0);
             if (globalize.getIsRTL())
                 self._pos.end *= -1;