diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
index c58a5573a9..52499aa47f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
@@ -180,24 +180,17 @@
 
 
         function openPageFieldOverlay() {
-            vm.pageFieldOverlay = {
-                submitButtonLabel: "Insert",
-                closeButtonlabel: "Cancel",
-                view: "insertfield",
-                show: true,
+            var insertFieldEditor = {
                 submit: function (model) {
                     insert(model.umbracoField);
-                    vm.pageFieldOverlay.show = false;
-                    vm.pageFieldOverlay = null;
+                    editorService.close();
                 },
-                close: function (model) {
-                    // close the dialog
-                    vm.pageFieldOverlay.show = false;
-                    vm.pageFieldOverlay = null;
-                    // focus editor
-                    vm.editor.focus();
+                close: function () {
+                    editorService.close();
+                    vm.editor.focus();                    
                 }
             };
+            editorService.insertField(insertFieldEditor);
         }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
index 810b1cb8ae..dde5fc8171 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
@@ -83,11 +83,4 @@
        position="right">
    </umb-overlay>
 
-    <umb-overlay
-        ng-if="vm.pageFieldOverlay.show"
-        model="vm.pageFieldOverlay"
-        position="right"
-        view="vm.pageFieldOverlay.view">
-    </umb-overlay>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
index d5a17c83c7..b125324833 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
@@ -187,24 +187,17 @@
 
 
         function openPageFieldOverlay() {
-            vm.pageFieldOverlay = {
-                submitButtonLabel: "Insert",
-                closeButtonlabel: "Cancel",
-                view: "insertfield",
-                show: true,
+            var insertFieldEditor = {
                 submit: function (model) {
                     insert(model.umbracoField);
-                    vm.pageFieldOverlay.show = false;
-                    vm.pageFieldOverlay = null;
+                    editorService.close();
                 },
-                close: function (model) {
-                    // close the dialog
-                    vm.pageFieldOverlay.show = false;
-                    vm.pageFieldOverlay = null;
-                    // focus editor
+                close: function () {
+                    editorService.close();
                     vm.editor.focus();                    
                 }
             };
+            editorService.insertField(insertFieldEditor);
         }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
index 4a16ad4ebf..5fc8f19d6c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
@@ -91,11 +91,4 @@
        position="right">
    </umb-overlay>
 
-    <umb-overlay
-        ng-if="vm.pageFieldOverlay.show"
-        model="vm.pageFieldOverlay"
-        position="right"
-        view="vm.pageFieldOverlay.view">
-    </umb-overlay>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
index 39ae1dd583..1a0cd93a35 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
@@ -407,24 +407,17 @@
 
 
         function openPageFieldOverlay() {
-            vm.pageFieldOverlay = {
-                submitButtonLabel: "Insert",
-                closeButtonlabel: "Cancel",
-                view: "insertfield",
-                show: true,
+            var insertFieldEditor = {
                 submit: function (model) {
                     insert(model.umbracoField);
-                    vm.pageFieldOverlay.show = false;
-                    vm.pageFieldOverlay = null;
+                    editorService.close();
                 },
-                close: function (model) {
-                    // close the dialog
-                    vm.pageFieldOverlay.show = false;
-                    vm.pageFieldOverlay = null;
-                    // focus editor
-                    vm.editor.focus();                    
+                close: function () {
+                    editorService.close();
+                    vm.editor.focus();
                 }
             };
+            editorService.insertField(insertFieldEditor);
         }
 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
index 0b1b574e70..b68c1845c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -131,13 +131,6 @@
        position="right">
    </umb-overlay>
 
-    <umb-overlay
-        ng-if="vm.pageFieldOverlay.show"
-        model="vm.pageFieldOverlay"
-        position="right"
-        view="vm.pageFieldOverlay.view">
-    </umb-overlay>
-
     <umb-overlay
        ng-if="vm.sectionsOverlay.show"
        model="vm.sectionsOverlay"