diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.controller.js
index 90d3e945a4..e24f8cd80b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.controller.js
@@ -52,28 +52,20 @@
         }
 
         function openPageFieldOverlay() {
-            vm.pageFieldOverlay = {
-                submitButtonLabel: "Insert",
-                closeButtonlabel: "Cancel",
-                view: "insertfield",
-                show: true,
+            var insertFieldEditor = {
                 submit: function(model) {
-
                   $scope.model.insert = {
                       "type": "umbracoField",
                       "umbracoField": model.umbracoField
                   };
-
                   $scope.model.submit($scope.model);
-
-                  vm.pageFieldOverlay.show = false;
-                  vm.pageFieldOverlay = null;
+                  editorService.close();
                 },
                 close: function (model) {
-                    vm.pageFieldOverlay.show = false;
-                    vm.pageFieldOverlay = null;
+                    editorService.close();
                 }
             };
+            editorService.insertField(insertFieldEditor);
         }
 
         function openDictionaryItemOverlay() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
index 2cc5cb2e5c..405a56e79b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.html
@@ -60,9 +60,5 @@
                  view="vm.macroPickerOverlay.view"
                  position="right">
     </umb-overlay>
-    <umb-overlay ng-if="vm.pageFieldOverlay.show"
-                 model="vm.pageFieldOverlay"
-                 position="right"
-                 view="vm.pageFieldOverlay.view">
-    </umb-overlay>
+    
 </div>