diff --git a/src/components/remotecontrol.js b/src/components/remotecontrol.js
index 76f0d673d0..9d99c0aaa7 100644
--- a/src/components/remotecontrol.js
+++ b/src/components/remotecontrol.js
@@ -156,10 +156,6 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
         }
     }
 
-    function buttonEnabled(btn, enabled) {
-        btn.disabled = !enabled;
-    }
-
     function buttonVisible(btn, enabled) {
         if (enabled) {
             btn.classList.remove("hide");
@@ -172,7 +168,8 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
         var all = context.querySelectorAll(".btnCommand");
 
         for (var i = 0, length = all.length; i < length; i++) {
-            buttonEnabled(all[i], -1 != commands.indexOf(all[i].getAttribute("data-command")));
+            var enableButton = -1 !== commands.indexOf(all[i].getAttribute("data-command"));
+            all[i].disabled = !enableButton;
         }
     }
 
diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboardpage.js
index 4f41136e9f..52f4672ab7 100644
--- a/src/controllers/dashboardpage.js
+++ b/src/controllers/dashboardpage.js
@@ -1,15 +1,6 @@
 define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globalize", "loading", "connectionManager", "playMethodHelper", "cardBuilder", "imageLoader", "components/activitylog", "scripts/imagehelper", "indicators", "humanedate", "listViewStyle", "emby-button", "flexStyles", "emby-button", "emby-itemscontainer"], function (datetime, events, itemHelper, serverNotifications, dom, globalize, loading, connectionManager, playMethodHelper, cardBuilder, imageLoader, ActivityLog, imageHelper, indicators) {
     "use strict";
 
-    function buttonEnabled(elem, enabled) {
-        if (enabled) {
-            elem.setAttribute("disabled", "");
-            elem.removeAttribute("disabled");
-        } else {
-            elem.setAttribute("disabled", "disabled");
-        }
-    }
-
     function showPlaybackInfo(btn, session) {
         require(["alert"], function (alert) {
             var showTranscodeReasons;
@@ -710,8 +701,8 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
                     primary: "cancel"
                 }).then(function () {
                     var page = dom.parentWithClass(btn, "page");
-                    buttonEnabled(page.querySelector("#btnRestartServer"), false);
-                    buttonEnabled(page.querySelector("#btnShutdown"), false);
+                    page.querySelector("#btnRestartServer").disabled = true;
+                    page.querySelector("#btnShutdown").disabled = true;
                     ApiClient.restartServer();
                 });
             });
@@ -725,8 +716,8 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
                     primary: "cancel"
                 }).then(function () {
                     var page = dom.parentWithClass(btn, "page");
-                    buttonEnabled(page.querySelector("#btnRestartServer"), false);
-                    buttonEnabled(page.querySelector("#btnShutdown"), false);
+                    page.querySelector("#btnRestartServer").disabled = true;
+                    page.querySelector("#btnShutdown").disabled = true;
                     ApiClient.shutdownServer();
                 });
             });
diff --git a/src/legacy/buttonenabled.js b/src/legacy/buttonenabled.js
deleted file mode 100644
index 6c2f3b1e94..0000000000
--- a/src/legacy/buttonenabled.js
+++ /dev/null
@@ -1,6 +0,0 @@
-define(["jQuery"], function($) {
-    "use strict";
-    $.fn.buttonEnabled = function(enabled) {
-        return enabled ? this.attr("disabled", "").removeAttr("disabled") : this.attr("disabled", "disabled")
-    }
-});
\ No newline at end of file
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 1626fb5bc3..0fabb41005 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -457,9 +457,8 @@ var AppInfo = {};
     function init() {
         define("livetvcss", ["css!css/livetv.css"], returnFirstDependency);
         define("detailtablecss", ["css!css/detailtable.css"], returnFirstDependency);
-        define("buttonenabled", ["legacy/buttonenabled"], returnFirstDependency);
-        var promises = [];
 
+        var promises = [];
         if (!window.fetch) {
             promises.push(require(["fetch"]));
         }