diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaBrowser.js b/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaBrowser.js
index f7176b255..d5a2d4ab4 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaBrowser.js
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaBrowser.js
@@ -57,7 +57,7 @@
     });
 
     $("#createFolder").live("click", function () {
-        $.post("MediaPicker/Admin/CreateFolder", { path: query("mediaPath"), folderName: $("#folderName").val(), __RequestVerificationToken: $("#__requesttoken").val() },
+        $.post("MediaPicker/CreateFolder", { path: query("mediaPath") || "", folderName: $("#folderName").val(), __RequestVerificationToken: $("#__requesttoken").val() },
             function (response) {
                 if (typeof response === "string") {
                     alert(response);
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaPicker.js b/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaPicker.js
index 575849dba..493fc7139 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaPicker.js
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Scripts/MediaPicker.js
@@ -16,7 +16,7 @@
         var adminIndex = location.href.toLowerCase().indexOf("/admin/");
         if (adminIndex === -1) return;
         var url = location.href.substr(0, adminIndex)
-            + "/MediaPicker/Admin?uploadpath=" + (data.uploadMediaPath || "")
+            + "/Admin/MediaPicker?uploadpath=" + (data.uploadMediaPath || "")
             + "&callback=" + callbackName
             + "&editmode=" + (!!(data.img && data.img.src))
             + "&" + (new Date() - 0);