diff --git a/src/components/shell.js b/src/components/shell.js
index f82f5eea3c..4f1aa0c8de 100644
--- a/src/components/shell.js
+++ b/src/components/shell.js
@@ -10,12 +10,6 @@ define([], function () {
             }
 
         },
-        canExec: false,
-        exec: function (options) {
-            // options.path
-            // options.arguments
-            return Promise.reject();
-        },
         enableFullscreen: function () {
             if (window.NativeShell) {
                 window.NativeShell.enableFullscreen();
diff --git a/src/controllers/user/menu.js b/src/controllers/user/menu.js
index 6087beadfe..b1e2b7b519 100644
--- a/src/controllers/user/menu.js
+++ b/src/controllers/user/menu.js
@@ -10,6 +10,10 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-button"], functio
             Dashboard.selectServer();
         });
 
+        view.querySelector(".clientSettings").addEventListener("click", function () {
+            window.NativeShell.openClientSettings();
+        });
+
         view.addEventListener("viewshow", function() {
             // this page can also be used by admins to change user preferences from the user edit page
             var userId = params.userId || Dashboard.getCurrentUserId();
@@ -21,6 +25,12 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-button"], functio
             page.querySelector(".lnkPlaybackPreferences").setAttribute("href", "mypreferencesplayback.html?userId=" + userId);
             page.querySelector(".lnkSubtitlePreferences").setAttribute("href", "mypreferencessubtitles.html?userId=" + userId);
 
+            if (window.NativeShell && window.NativeShell.AppHost.supports("clientsettings")) {
+                page.querySelector(".clientSettings").classList.remove("hide");
+            } else {
+                page.querySelector(".clientSettings").classList.add("hide");
+            }
+
             if (appHost.supports("multiserver")) {
                 page.querySelector(".selectServer").classList.remove("hide");
             } else {
diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html
index 41fcd1b75c..4219059dd0 100644
--- a/src/mypreferencesmenu.html
+++ b/src/mypreferencesmenu.html
@@ -47,6 +47,15 @@
                         </div>
                     </div>
                 </a>
+
+                <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="clientSettings listItem-border">
+                    <div class="listItem">
+                        <i class="material-icons listItemIcon listItemIcon-transparent devices_other"></i>
+                        <div class="listItemBody">
+                            <div class="listItemBodyText">${ClientSettings}</div>
+                        </div>
+                    </div>
+                </a>
             </div>
             <div class="adminSection verticalSection verticalSection-extrabottompadding">
                 <h2 class="sectionTitle" style="padding-left:.25em;">${HeaderAdmin}</h2>
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 022e56b903..1afa731186 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -147,6 +147,7 @@
     "ChannelNumber": "Channel number",
     "Channels": "Channels",
     "CinemaModeConfigurationHelp": "Cinema mode brings the theater experience straight to your living room with the ability to play trailers and custom intros before the main feature.",
+    "ClientSettings": "Client Settings",
     "Collections": "Collections",
     "ColorPrimaries": "Color primaries",
     "ColorSpace": "Color space",