diff --git a/src/components/apphost.js b/src/components/apphost.js
index addc352c15..5b59b4fece 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -265,7 +265,11 @@ const supportedFeatures = function () {
     }
 
     features.push(AppFeature.DisplayLanguage);
-    features.push(AppFeature.DisplayMode);
+
+    if (!browser.xboxOne) {
+        features.push(AppFeature.DisplayMode);
+    }
+
     features.push(AppFeature.TargetBlank);
     features.push(AppFeature.Screensaver);
 
diff --git a/src/controllers/user/controls/index.html b/src/controllers/user/controls/index.html
index 512f3df05e..5ebaad84e9 100644
--- a/src/controllers/user/controls/index.html
+++ b/src/controllers/user/controls/index.html
@@ -6,7 +6,7 @@
                     ${Controls}
                 </h2>
 
-                <div class="checkboxContainer checkboxContainer-withDescription">
+                <div class="checkboxContainer checkboxContainer-withDescription enableGamepadContainer hide">
                     <label>
                         <input type="checkbox" is="emby-checkbox" class="chkEnableGamepad" />
                         <span>${LabelEnableGamepad}</span>
diff --git a/src/controllers/user/controls/index.js b/src/controllers/user/controls/index.js
index 1917fecf42..501f996741 100644
--- a/src/controllers/user/controls/index.js
+++ b/src/controllers/user/controls/index.js
@@ -3,6 +3,7 @@ import toast from '../../../components/toast/toast';
 import globalize from '../../../lib/globalize';
 import appSettings from '../../../scripts/settings/appSettings';
 import Events from '../../../utils/events.ts';
+import browser from 'scripts/browser';
 
 export default function (view) {
     function submit(e) {
@@ -21,6 +22,11 @@ export default function (view) {
     view.addEventListener('viewshow', function () {
         view.querySelector('.smoothScrollContainer').classList.toggle('hide', !layoutManager.tv);
 
+        if (browser.edgeUwp) {
+            view.querySelector('.enableGamepadContainer').classList.add('hide');
+        } else {
+            view.querySelector('.enableGamepadContainer').classList.remove('hide');
+        }
         view.querySelector('.chkEnableGamepad').checked = appSettings.enableGamepad();
         view.querySelector('.chkSmoothScroll').checked = appSettings.enableSmoothScroll();