diff --git a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.ContentMenuItem.Edit.cshtml b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.ContentMenuItem.Edit.cshtml
index e971216a9..750c463ef 100644
--- a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.ContentMenuItem.Edit.cshtml
+++ b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.ContentMenuItem.Edit.cshtml
@@ -28,7 +28,8 @@
                 if (menuText.val().length == 0) {
                     menuText.val(data.displayText);
                 }
-            }
+            },
+            baseUrl: '@Url.Content("~/")'
         });
     });
 //]]>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js b/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js
index 417bdcf5e..85966ac8b 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js
@@ -15,9 +15,13 @@
         };
         $[callbackName].data = data;
 
-        var adminIndex = location.href.toLowerCase().indexOf("/admin/");
-        if (adminIndex === -1) return;
-        var url = location.href.substr(0, adminIndex)
+        var baseUrl = data.baseUrl;
+
+        // remove trailing slash if any
+        if (baseUrl.substr(-1) == '/')
+            baseUrl.substr(0, baseUrl.length - 1);
+        
+        var url = baseUrl
             + "/Admin/Orchard.ContentPicker?"
             + "callback=" + callbackName
             + "&" + (new Date() - 0);
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Fields/ContentPicker.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Fields/ContentPicker.Edit.cshtml
index f43677c48..7cbfec51b 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Fields/ContentPicker.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Fields/ContentPicker.Edit.cshtml
@@ -86,7 +86,8 @@
 
                     refreshIds();
                     $('#save-message-@Html.FieldIdFor(m => m.Field.Ids)').show();
-                }
+                },
+                baseUrl: '@Url.Content("~/")'
             });
         });