diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js
index 59d865c63..ab347d938 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js
@@ -1,9 +1,9 @@
 (function ($) {
-    var LayoutDesignerHost = function (element) {
+    var LayoutDesignerHost = function (element, layoutEditor) {
         var self = this;
         this.element = element;
         this.element.data("layout-designer-host", this);
-        this.editor = window.layoutEditor;
+        this.editor = layoutEditor;
         this.isFormSubmitting = false;
         this.settings = {
             antiForgeryToken: self.element.data("anti-forgery-token"),
@@ -120,20 +120,6 @@
     // Export types.
     window.Orchard = window.Orchard || {};
     window.Orchard.Layouts = window.Orchard.Layouts || {};
-    window.Orchard.Layouts.LayoutEditorHost = window.Orchard.Layouts.LayoutEditorHost || {};
+    window.Orchard.Layouts.LayoutDesignerHost = LayoutDesignerHost;
 
-    $(function () {
-        var host = new LayoutDesignerHost($(".layout-designer"));
-        $(".layout-designer").each(function (e) {
-            var designer = $(this);
-            var dialog = designer.find(".layout-editor-help-dialog");
-            designer.find(".layout-editor-help-link").click(function (e) {
-                dialog.dialog({
-                    modal: true,
-                    width: 840
-                });
-                e.preventDefault();
-            });
-        });
-    });
 })(jQuery);
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml
index ce5470d25..48bb3c63d 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml
@@ -42,8 +42,20 @@
             jQuery(function () {
                 var editorConfig = JSON.parse(LayoutEditor.decode("@Html.Raw(Url.Encode(Model.ConfigurationData))"));
                 var editorCanvasData = JSON.parse(LayoutEditor.decode("@Html.Raw(Url.Encode(Model.Data))"));
+                var layoutEditor = window.layoutEditor = new LayoutEditor.Editor(editorConfig, editorCanvasData);
 
-                window.layoutEditor = new LayoutEditor.Editor(editorConfig, editorCanvasData);
+                var host = new window.Orchard.Layouts.LayoutDesignerHost($(".layout-designer"), layoutEditor);
+                $(".layout-designer").each(function (e) {
+                    var designer = $(this);
+                    var dialog = designer.find(".layout-editor-help-dialog");
+                    designer.find(".layout-editor-help-link").click(function (e) {
+                        dialog.dialog({
+                            modal: true,
+                            width: 840
+                        });
+                        e.preventDefault();
+                    });
+                });
             });
         </script>
     }