diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js
index 9f5f1bb6d..3f0fd3b78 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Scripts/orchard-designertools-shapetracing.js
@@ -1,4 +1,4 @@
-(function ($) {
+jQuery(document).ready(function ($) {
     $(function () {
         // append the shape tracing window container at the end of the document
         $('<div id="shape-tracing-container"> ' +
@@ -405,4 +405,4 @@
         return node;
     }
 
-})(jQuery);
+});
diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs
index bdee8ea74..5b0e37a70 100644
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Linq;
 using System.Web.Routing;
 using System.Xml;
 using Orchard.DisplayManagement.Descriptors;
@@ -96,11 +97,11 @@ namespace Orchard.DesignerTools.Services {
                 context.Shape._Dump = sw.ToString();
             }
 
-            shape.Template = descriptor.BindingSource;
+            shape.Template = descriptor.Bindings.Values.FirstOrDefault().BindingSource;
 
             try {
-                if (_webSiteFolder.FileExists(descriptor.BindingSource)) {
-                    shape.TemplateContent = _webSiteFolder.ReadFile(descriptor.BindingSource);
+                if (_webSiteFolder.FileExists(shape.Template)) {
+                    shape.TemplateContent = _webSiteFolder.ReadFile(shape.Template);
                 }
             }
             catch {