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 e24f8cd80b..526d076048 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
@@ -28,27 +28,22 @@
         }
 
         function openMacroPicker() {
-
-            vm.macroPickerOverlay = {
-                view: "macropicker",
+            var macroPicker = {
                 dialogData: {},
-                show: true,
                 submit: function(model) {
-
                     $scope.model.insert = {
                         "type": "macro",
                         "macroParams": model.macroParams,
                         "selectedMacro": model.selectedMacro
                     };
-
                     $scope.model.submit($scope.model);
-
-                    vm.macroPickerOverlay.show = false;
-                    vm.macroPickerOverlay = null;
-
+                    editorService.close();
+                },
+                close: function() {
+                    editorService.close();
                 }
             };
-
+            editorService.macroPicker(macroPicker);
         }
 
         function openPageFieldOverlay() {
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 52499aa47f..84b58cac94 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
@@ -154,28 +154,19 @@
         }
 
         function openMacroOverlay() {
-
-            vm.macroPickerOverlay = {
-                view: "macropicker",
+            var macroPicker = {
                 dialogData: {},
-                show: true,
                 submit: function (model) {
-
                     var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, "Mvc");
                     insert(macroObject.syntax);
-
-                    vm.macroPickerOverlay.show = false;
-                    vm.macroPickerOverlay = null;
-
+                    editorService.close();
                 },
-                close: function(oldModel) {
-                    // close the dialog
-                    vm.macroPickerOverlay.show = false;
-                    vm.macroPickerOverlay = null;
-                    // focus editor
+                close: function() {
+                    editorService.close();
                     vm.editor.focus();
                 }
             };
+            editorService.macroPicker(macroPicker);
         }
 
 
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 dde5fc8171..e28b76d785 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
@@ -76,11 +76,4 @@
         </umb-editor-view>
     </form>
 
-    <umb-overlay
-       ng-if="vm.macroPickerOverlay.show"
-       model="vm.macroPickerOverlay"
-       view="vm.macroPickerOverlay.view"
-       position="right">
-   </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 b125324833..a337a00acc 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
@@ -161,31 +161,21 @@
 
 
         function openMacroOverlay() {
-
-            vm.macroPickerOverlay = {
-                view: "macropicker",
+            var macroPicker = {
                 dialogData: {},
-                show: true,
                 submit: function (model) {
-
                     var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, "Mvc");
                     insert(macroObject.syntax);
-
-                    vm.macroPickerOverlay.show = false;
-                    vm.macroPickerOverlay = null;
-
+                    editorService.close();
                 },
-                close: function(oldModel) {
-                    // close the dialog
-                    vm.macroPickerOverlay.show = false;
-                    vm.macroPickerOverlay = null;
-                    // focus editor
+                close: function() {
+                    editorService.close();
                     vm.editor.focus();
                 }
             };
+            editorService.macroPicker(macroPicker);
         }
 
-
         function openPageFieldOverlay() {
             var insertFieldEditor = {
                 submit: function (model) {
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 5fc8f19d6c..a222234e80 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
@@ -84,11 +84,4 @@
         </umb-editor-view>
     </form>
 
-    <umb-overlay
-       ng-if="vm.macroPickerOverlay.show"
-       model="vm.macroPickerOverlay"
-       view="vm.macroPickerOverlay.view"
-       position="right">
-   </umb-overlay>
-
 </div>
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 f2ee70801d..7bc063b020 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -123,12 +123,5 @@
 
         </umb-editor-view>
     </form>
-   
-   <umb-overlay
-       ng-if="vm.masterTemplateOverlay.show"
-       model="vm.masterTemplateOverlay"
-       view="vm.masterTemplateOverlay.view"
-       position="right">
-   </umb-overlay>
 
 </div>