diff --git a/src/components/scrollManager.js b/src/components/scrollManager.js
index 49c2cebc32..2f0917391f 100644
--- a/src/components/scrollManager.js
+++ b/src/components/scrollManager.js
@@ -4,7 +4,7 @@
  */
 
 import dom from '../scripts/dom';
-import browser from '../scripts/browser';
+import appSettings from 'scripts/settings/appSettings';
 import layoutManager from './layoutManager';
 
 /**
@@ -477,7 +477,7 @@ function doScroll(xScroller, scrollX, yScroller, scrollY, smooth) {
      * Returns true if smooth scroll must be used.
      */
 function useSmoothScroll() {
-    return !!browser.tizen;
+    return appSettings.enableSmoothScroll();
 }
 
 /**
diff --git a/src/controllers/user/controls/index.html b/src/controllers/user/controls/index.html
index 8c54db4bd9..512f3df05e 100644
--- a/src/controllers/user/controls/index.html
+++ b/src/controllers/user/controls/index.html
@@ -14,6 +14,13 @@
                     <div class="fieldDescription checkboxFieldDescription">${EnableGamepadHelp}</div>
                     <div class="fieldDescription checkboxFieldDescription">${LabelPleaseRestart}</div>
                 </div>
+
+                <div class="checkboxContainer checkboxContainer-withDescription smoothScrollContainer hide">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" class="chkSmoothScroll" />
+                        <span>${EnableSmoothScroll}</span>
+                    </label>
+                </div>
             </div>
 
             <button is="emby-button" type="submit" class="raised button-submit block btnSave hide">
diff --git a/src/controllers/user/controls/index.js b/src/controllers/user/controls/index.js
index cb212e5297..4af6dde424 100644
--- a/src/controllers/user/controls/index.js
+++ b/src/controllers/user/controls/index.js
@@ -1,3 +1,4 @@
+import layoutManager from 'components/layoutManager';
 import toast from '../../../components/toast/toast';
 import globalize from '../../../scripts/globalize';
 import appSettings from '../../../scripts/settings/appSettings';
@@ -6,6 +7,7 @@ import Events from '../../../utils/events.ts';
 export default function (view) {
     function submit(e) {
         appSettings.enableGamepad(view.querySelector('.chkEnableGamepad').checked);
+        appSettings.enableSmoothScroll(view.querySelector('.chkSmoothScroll').checked);
 
         toast(globalize.translate('SettingsSaved'));
 
@@ -17,7 +19,11 @@ export default function (view) {
     }
 
     view.addEventListener('viewshow', function () {
+        view.querySelector('.smoothScrollContainer').classList.toggle('hide', !layoutManager.tv);
+
         view.querySelector('.chkEnableGamepad').checked = appSettings.enableGamepad();
+        view.querySelector('.chkSmoothScroll').checked = appSettings.enableSmoothScroll();
+
         view.querySelector('form').addEventListener('submit', submit);
         view.querySelector('.btnSave').classList.remove('hide');
 
diff --git a/src/scripts/settings/appSettings.js b/src/scripts/settings/appSettings.js
index df18b0ddff..b28c315325 100644
--- a/src/scripts/settings/appSettings.js
+++ b/src/scripts/settings/appSettings.js
@@ -1,3 +1,4 @@
+import browser from 'scripts/browser';
 import Events from '../../utils/events.ts';
 import { toBoolean } from '../../utils/string.ts';
 
@@ -31,6 +32,19 @@ class AppSettings {
         return toBoolean(this.get('enableGamepad'), false);
     }
 
+    /**
+     * Get or set 'Enable smooth scroll' state.
+     * @param {boolean|undefined} val - Flag to enable 'Enable smooth scroll' or undefined.
+     * @return {boolean} 'Enable smooth scroll' state.
+     */
+    enableSmoothScroll(val) {
+        if (val !== undefined) {
+            return this.set('enableSmoothScroll', val.toString());
+        }
+
+        return toBoolean(this.get('enableSmoothScroll'), !!browser.tizen);
+    }
+
     enableSystemExternalPlayers(val) {
         if (val !== undefined) {
             this.set('enableSystemExternalPlayers', val.toString());
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 1d48742604..7ff7cad1e7 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -254,6 +254,7 @@
     "EnableRewatchingNextUp": "Enable Rewatching in Next Up",
     "EnableRewatchingNextUpHelp": "Enable showing already watched episodes in 'Next Up' sections.",
     "EnableQuickConnect": "Enable Quick Connect on this server",
+    "EnableSmoothScroll": "Enable smooth scroll",
     "EnableStreamLooping": "Auto-loop live streams",
     "EnableStreamLoopingHelp": "Enable this if live streams only contain a few seconds of data and need to be continuously requested. Enabling this when not needed may cause problems.",
     "EnableThemeSongsHelp": "Play the theme songs in background while browsing the library.",