diff --git a/www/assets/js/data.js b/www/assets/js/data.js
index 5ca7405c..aa03ae19 100644
--- a/www/assets/js/data.js
+++ b/www/assets/js/data.js
@@ -88,7 +88,8 @@ var USEROPTS = {
     sync_accuracy   : getOrDefault("sync_accuracy", 2),
     chatbtn         : getOrDefault("chatbtn", false),
     altsocket       : getOrDefault("altsocket", false),
-    joinmessage     : getOrDefault("joinmessage", true)
+    joinmessage     : getOrDefault("joinmessage", true),
+    qbtn_always     : getOrDefault("qbtn_always", false)
 };
 
 var Rank = {
diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index d8696408..1ff525a1 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -261,7 +261,8 @@ function addQueueButtons(li) {
             .appendTo(menu);
     }
 
-    menu.hide();
+    if(!USEROPTS.qbtn_always)
+        menu.hide();
 
     li.contextmenu(function(ev) {
         ev.preventDefault();
@@ -329,6 +330,12 @@ function showOptionsMenu() {
     addOption("", warn);
     $("<hr>").appendTo(form);
 
+    var qbtncontainer = $("<label/>").addClass("checkbox")
+        .text("Show playlist buttons by default");
+    var qbtn = $("<input/>").attr("type", "checkbox").appendTo(qbtncontainer);
+    qbtn.prop("checked", USEROPTS.qbtn_always);
+    addOption("Playlist Buttons", qbtncontainer);
+
     var synchcontainer = $("<label/>").addClass("checkbox")
         .text("Synchronize Media");
     var synch = $("<input/>").attr("type", "checkbox").appendTo(synchcontainer);
@@ -409,6 +416,7 @@ function showOptionsMenu() {
         USEROPTS.blink_title     = blink.prop("checked");
         USEROPTS.chatbtn         = sendbtn.prop("checked");
         USEROPTS.altsocket       = altsocket.prop("checked");
+        USEROPTS.qbtn_always     = qbtn.prop("checked");
         if(CLIENT.rank >= Rank.Moderator) {
             USEROPTS.modhat = modhat.prop("checked");
             USEROPTS.joinmessage = join.prop("checked");