diff --git a/README.rst b/README.rst
index d078789..4a45093 100644
--- a/README.rst
+++ b/README.rst
@@ -59,6 +59,7 @@ v2.0.1 (UNRELEASED)
 - Support for Mopidy-Grooveshark.
 - Fixed slow to start playing from a large tracklist of browsed tracks.
 - Added link to `Alarm Clock <https://pypi.python.org/pypi/Mopidy-AlarmClock/>`_ (if present).
+- Added ability to save Queue as local Playlist.
 
 v2.0.0 (26-3-2015)
 ------------------
diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html
index 80cd301..2310738 100644
--- a/mopidy_musicbox_webclient/static/index.html
+++ b/mopidy_musicbox_webclient/static/index.html
@@ -334,7 +334,8 @@
 <!--/browsepane-->
 
 <div data-role="content" class="pane" id="currentpane">
-    <a style="float:right" onclick="return clearQueue();" data-role="button">Clear</a><h4>Play Queue</h4>
+    <a style="float:right" onclick="return clearQueue();" data-role="button">Clear</a>
+    <a style="float:right; margin-right: 0.5em" onclick="return saveQueue();" data-role="button">Save</a><h4>Play Queue</h4>
     <!--                <ul data-role="listview" data-icon="false" data-theme="d" data-inset="true" id="currenttable"></ul>
                     <ul data-role="listview" data-icon="false" data-theme="d" data-inset="true" id="currenttable"></ul> -->
     <ul class="table" id="currenttable"></ul>
diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index 74b3d46..83cfc39 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -227,6 +227,30 @@ function clearQueue() {
     return false;
 }
 
+function saveQueue() {
+    mopidy.tracklist.getTracks().then(function(tracks) {
+        if (tracks.length > 0) {
+            var plname = window.prompt("Playlist name:", "").trim();
+            if (plname != null && plname != "") {
+                mopidy.playlists.filter({"name": plname}).then(function(existing) {
+                    var exists = false;
+                    for (var i = 0; i < existing.length; i++) {
+                        exists = exists || existing[i].uri.indexOf("m3u:") == 0 || existing[i].uri.indexOf("local:") == 0;
+                    }
+                    if (!exists || window.confirm("Overwrite existing playlist \"" + plname + "\"?")) {
+                        mopidy.playlists.create(plname, "local").then(function(playlist) {
+                             playlist.tracks = tracks;
+                             mopidy.playlists.save(playlist).then();
+                             getPlaylists();
+                        });
+                    }
+                });
+            }
+        }
+    });
+    return false;
+}
+
 /**********************
  * Buttons
  */