diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
index c26e8bbacb..36640eae75 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
@@ -1,6 +1,6 @@
 //used for the media picker dialog
 angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
-    function ($scope, eventsService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService) {
+    function ($scope, eventsService, entityResource, contentResource, mediaHelper, userService, localizationService, tinyMceService, editorService) {
         
         var vm = this;
         var dialogOptions = $scope.model;
@@ -108,11 +108,9 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
 
         $scope.switchToMediaPicker = function () {
             userService.getCurrentUser().then(function (userData) {
-                $scope.mediaPickerOverlay = {
-                    view: "mediapicker",
+                var mediaPicker = {
                     startNodeId: userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0],
                     startNodeIsVirtual: userData.startMediaIds.length !== 1,
-                    show: true,
                     submit: function (model) {
                         var media = model.selectedImages[0];
 
@@ -122,12 +120,13 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController",
                         $scope.model.target.name = media.name;
                         $scope.model.target.url = mediaHelper.resolveFile(media);
 
-                        debugger;
-
-                        $scope.mediaPickerOverlay.show = false;
-                        $scope.mediaPickerOverlay = null;
+                        editorService.close();
+                    },
+                    close: function() {
+                        editorService.close();
                     }
                 };
+                editorService.mediaPicker(mediaPicker);
             });
         };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
index c47f5a4658..dd258f6c75 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html
@@ -109,13 +109,6 @@
                             <localize key="defaultdialogs_selectMedia">Select media</localize>
                         </a>
                     </div>
-                
-                    <umb-overlay 
-                        ng-if="mediaPickerOverlay.show"
-                        model="mediaPickerOverlay"
-                        view="mediaPickerOverlay.view"
-                        position="right">
-                    </umb-overlay>
 
                 </umb-box-content>
             </umb-box>