diff --git a/templates/channel.jade b/templates/channel.jade
index cbfc7266..6b9a4c3b 100644
--- a/templates/channel.jade
+++ b/templates/channel.jade
@@ -115,6 +115,7 @@ html(lang="en")
                     label
                       input.add-temp(type="checkbox")
                       | Add as temporary
+                  div#addfromurl-queue
                 #customembed.collapse.plcontrol-collapse.col-lg-12.col-md-12
                   .vertical-spacer
                   .input-group
diff --git a/www/js/ui.js b/www/js/ui.js
index 8b0f4445..f86ad47b 100644
--- a/www/js/ui.js
+++ b/www/js/ui.js
@@ -344,37 +344,67 @@ function queue(pos, src) {
             temp: $(".add-temp").prop("checked")
         });
     } else {
-        var link = $("#mediaurl").val();
-        var data = parseMediaLink(link);
-        var duration = undefined;
-        var title = undefined;
-        if (link.indexOf("jw:") === 0) {
-            duration = parseInt($("#addfromurl-duration-val").val());
-            if (duration <= 0 || isNaN(duration)) {
-                duration = undefined;
-            }
-        }
-        if (data.type === "fi") {
-            title = $("#addfromurl-title-val").val();
+        var links = $("#mediaurl").val().split(",");
+        if (pos === "next") links = links.reverse();
+        if (pos === "next" && $("#queue li").length === 0) links.unshift(links.pop());
+        var emitQueue = [];
+        var addTemp = $(".add-temp").prop("checked");
+        var notification = document.getElementById("addfromurl-queue");
+        if (!notification) {
+            notification = document.createElement("div");
+            notification.id = "addfromurl-queue";
+            document.getElementById("addfromurl").appendChild(notification);
         }
 
-        if (data.id == null || data.type == null) {
-            makeAlert("Error", "Failed to parse link.  Please check that it is correct",
-                      "alert-danger")
-                .insertAfter($("#addfromurl"));
-        } else {
-            $("#mediaurl").val("");
-            $("#addfromurl-duration").remove();
-            $("#addfromurl-title").remove();
-            socket.emit("queue", {
-                id: data.id,
-                type: data.type,
-                pos: pos,
-                duration: duration,
-                title: title,
-                temp: $(".add-temp").prop("checked")
-            });
+        links.forEach(function (link) {
+            var data = parseMediaLink(link);
+            var duration = undefined;
+            var title = undefined;
+            if (data.type === "fi") {
+                title = $("#addfromurl-title-val").val();
+            }
+
+            if (data.id == null || data.type == null) {
+                makeAlert("Error", "Failed to parse link " + link +
+                          ".  Please check that it is correct",
+                          "alert-danger")
+                    .insertAfter($("#addfromurl"));
+            } else {
+                emitQueue.push({
+                    id: data.id,
+                    type: data.type,
+                    pos: pos,
+                    duration: duration,
+                    title: title,
+                    temp: addTemp,
+                    link: link
+                });
+            }
+        });
+
+        var nextQueueDelay = 1020;
+        function next() {
+            var data = emitQueue.shift();
+            if (!data) {
+                $("#mediaurl").val("");
+                $("#addfromurl-title").remove();
+                return;
+            }
+
+            var link = data.link;
+            delete data.link;
+
+            socket.emit("queue", data);
+            if (emitQueue.length > 0) {
+                notification.textContent = "Waiting to queue " + emitQueue[0].link;
+            } else {
+                notification.textContent = "";
+            }
+
+            setTimeout(next, nextQueueDelay);
         }
+
+        next();
     }
 }
 
@@ -387,23 +417,6 @@ $("#mediaurl").keyup(function(ev) {
     if (ev.keyCode === 13) {
         queue("end", "url");
     } else {
-        if ($("#mediaurl").val().indexOf("jw:") === 0) {
-            var duration = $("#addfromurl-duration");
-            if (duration.length === 0) {
-                duration = $("<div/>")
-                    .attr("id", "addfromurl-duration")
-                    .appendTo($("#addfromurl"));
-                $("<span/>").text("JWPlayer Duration (seconds) (optional)")
-                    .appendTo(duration);
-                $("<input/>").addClass("form-control")
-                    .attr("type", "text")
-                    .attr("id", "addfromurl-duration-val")
-                    .appendTo($("#addfromurl-duration"));
-            }
-        } else {
-            $("#addfromurl-duration").remove();
-        }
-
         var url = $("#mediaurl").val().split("?")[0];
         if (url.match(/^https?:\/\/(.*)?\.(flv|mp4|og[gv]|webm|mp3|mov)$/)) {
             var title = $("#addfromurl-title");
diff --git a/www/js/util.js b/www/js/util.js
index e358cd4b..fd13a2e7 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -1219,7 +1219,7 @@ function parseMediaLink(url) {
     if(url.indexOf("jw:") == 0) {
         return {
             id: url.substring(3),
-            type: "jw"
+            type: "fi"
         };
     }