diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js b/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js
index a87f88496..8957d46d2 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/ContentPicker.js
@@ -24,9 +24,15 @@
         var url = baseUrl
             + "/Admin/Orchard.ContentPicker?"
             + "callback=" + callbackName
-            + "&" + (new Date() - 0)
-            + "&part=" + encodeURIComponent(data.part)
-            + "&field=" + encodeURIComponent(data.field);
+            + "&" + (new Date() - 0);
+
+        if (data.part) {
+            url += "&part=" + encodeURIComponent(data.part);
+        }
+
+        if (data.field) {
+            url += "&field=" + encodeURIComponent(data.field);
+        }
 
         var w = window.open(url, "_blank", data.windowFeatures || "width=685,height=700,status=no,toolbar=no,location=no,menubar=no,resizable=no,scrollbars=yes");
     });