diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
index cf2fff6dbd..834f1ec800 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
@@ -465,3 +465,8 @@
     padding: 1em;
     flex-shrink: 0;
 }
+
+.noRubberBanding {
+    /* This is needed to combat the rubber banding in iOS */
+    padding-bottom: 100px;
+}
diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
index 1050c59abb..6df0fc78af 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
@@ -841,7 +841,7 @@
                 require(['scrollHelper'], function (scrollHelper) {
 
                     var fn = enabled ? 'on' : 'off';
-                    scrollHelper.centerFocus[fn](view.querySelector('.smoothScrollY'), false);
+                    scrollHelper.centerFocus[fn](view.querySelector('.guideVerticalScroller'), false);
                     scrollHelper.centerFocus[fn](view.querySelector('.programGrid'), true);
                 });
             }
@@ -936,6 +936,16 @@
 
             programGrid.addEventListener('focus', onProgramGridFocus, true);
 
+            if (browser.iOS || browser.osx) {
+                context.querySelector('.channelsContainer').classList.add('noRubberBanding');
+
+                var programGridContainer = context.querySelector('.programGridContainer');
+
+                programGridContainer.classList.add('noRubberBanding');
+                programGridContainer.classList.remove('smoothScrollX');
+                programGridContainer.classList.add('hiddenScrollX');
+            }
+
             dom.addEventListener(programGrid, 'scroll', function (e) {
                 onProgramGridScroll(context, this, timeslotHeaders);
             }, {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html b/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
index 74d0f0272e..701c60e140 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/tvguide.template.html
@@ -28,6 +28,7 @@
         <div class="programGridContainer programGrid smoothScrollX guideScroller" style="white-space: nowrap;">
         </div>
     </div>
+
 </div>
 
 <div class="guideRequiresUnlock hide">