diff --git a/src/elements/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js
index 45010ae147..e574a4b872 100644
--- a/src/elements/emby-select/emby-select.js
+++ b/src/elements/emby-select/emby-select.js
@@ -7,8 +7,9 @@ import 'webcomponents.js/webcomponents-lite';
 const EmbySelectPrototype = Object.create(HTMLSelectElement.prototype);
 
 function enableNativeMenu() {
+    // WebView 2 creates dropdown that doesn't work with controller.
     if (browser.edgeUwp || browser.xboxOne) {
-        return true;
+        return false;
     }
 
     // Doesn't seem to work at all
@@ -80,7 +81,7 @@ function onMouseDown(e) {
 
 function onKeyDown(e) {
     // Xbox controller for UWP WebView2 uses keycode 195 to select.
-    if (e.keyCode === 13 && !enableNativeMenu() || (e.keyCode === 195 && browser.edgeChromium)) {
+    if ((e.keyCode === 13 || e.keyCode === 195) && !enableNativeMenu()) {
         e.preventDefault();
         showActionSheet(this);
     }