diff --git a/static/js/downloadVideoDialog.js b/static/js/downloadVideoDialog.js
index 9e32cad9..0eb3acac 100644
--- a/static/js/downloadVideoDialog.js
+++ b/static/js/downloadVideoDialog.js
@@ -128,7 +128,7 @@ pandora.ui.downloadVideoDialog = function(options) {
                             }, function(result) {
                                 if (result.data.taskId) {
                                     pandora.wait(result.data.taskId, function(result) {
-                                        console.log('wait -> ', result)
+                                        //console.log('wait -> ', result)
                                         if (result.data.result) {
                                             url = '/' + options.item
                                                 + '/' + values.resolution
@@ -163,7 +163,7 @@ pandora.ui.downloadVideoDialog = function(options) {
                         }
                         if (url) {
                             that.close();
-                            document.location.href = url
+                            document.location.href = pandora.getMediaURL(url)
                         }
                     }
                 })
diff --git a/static/js/player.js b/static/js/player.js
index 3ed11e83..aaeb1a4d 100644
--- a/static/js/player.js
+++ b/static/js/player.js
@@ -84,7 +84,13 @@ pandora.ui.player = function(data) {
                 }), 'clip');
             },
             downloadvideo: function() {
-                document.location.href = pandora.getDownloadLink(ui.item, data.rightslevel);
+                pandora.ui.downloadVideoDialog({
+                    item: ui.item,
+                    rightsLevel: data.rightsLevel,
+                    source: data.source && pandora.hasCapability('canDownloadSource'),
+                    title: data.title,
+                    video: data.video
+                }).open();
             },
             find: function(data) {
                 pandora.UI.set({itemFind: data.find});