diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
index 5c84bf8c01..1c61baf54a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js
@@ -3,7 +3,7 @@
 angular.module('umbraco')
     .controller("Umbraco.PrevalueEditors.TreePickerController",
 
-    function ($scope, dialogService, entityResource, $log, iconHelper) {
+    function ($scope, dialogService, entityResource, $log, iconHelper, editorService) {
         $scope.renderModel = [];
         $scope.ids = [];
 
@@ -12,7 +12,6 @@ angular.module('umbraco')
         $scope.sortable = false;
 
         var config = {
-            view: "treepicker",
             multiPicker: false,
             entityType: "Document",
             type: "content",
@@ -51,28 +50,24 @@ angular.module('umbraco')
         }
 
         $scope.openContentPicker = function () {
-            $scope.treePickerOverlay = config;
-            $scope.treePickerOverlay.section = config.type;
-            $scope.treePickerOverlay.show = true;
-
-            $scope.treePickerOverlay.submit = function (model) {
+            var treePicker = config;
+            treePicker.section = config.type;
 
+            treePicker.submit = function (model) {
                 if (config.multiPicker) {
                     populate(model.selection);
                 } else {
                     populate(model.selection[0]);
                 }
-
-                $scope.treePickerOverlay.show = false;
-                $scope.treePickerOverlay = null;
+                editorService.close();
             };
 
-            $scope.treePickerOverlay.close = function (oldModel) {
-                $scope.treePickerOverlay.show = false;
-                $scope.treePickerOverlay = null;
+            treePicker.close = function () {
+                editorService.close();
             };
 
-        }
+            editorService.treePicker(treePicker);
+        };
 
         $scope.remove = function (index) {
             $scope.renderModel.splice(index, 1);
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
index 7d68a9c82e..ae260b4502 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
@@ -23,11 +23,4 @@
 		<localize key="general_add">Add</localize>
 	</a>
 
-	<umb-overlay
-		ng-if="treePickerOverlay.show"
-		model="treePickerOverlay"
-		position="right"
-		view="treePickerOverlay.view">
-	</umb-overlay>
-
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
index 5a53e00e1c..6d5d205fa1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
@@ -3,7 +3,7 @@
 angular.module('umbraco')
 .controller("Umbraco.PrevalueEditors.TreeSourceController",
 	
-	function($scope, dialogService, entityResource, $log, iconHelper){
+	function($scope, dialogService, entityResource, $log, iconHelper, editorService){
 
 	    if (!$scope.model) {
 	        $scope.model = {};
@@ -33,20 +33,21 @@ angular.module('umbraco')
 
 
 		$scope.openContentPicker =function(){
-			$scope.treePickerOverlay = {
-                view: "treepicker",
+			var treePicker = {
                 idType: $scope.model.config.idType,
 				section: $scope.model.value.type,
 				treeAlias: $scope.model.value.type,
 				multiPicker: false,
-				show: true,
 				submit: function(model) {
 					var item = model.selection[0];
 					populate(item);
-					$scope.treePickerOverlay.show = false;
-					$scope.treePickerOverlay = null;
+					editorService.close();
+				},
+				close: function() {
+					editorService.close();
 				}
 			};
+			editorService.treePicker(treePicker);
 		};
 
 		$scope.clear = function() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
index df9f64db9f..4ad6fd5986 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
@@ -77,11 +77,4 @@
 		</span>
 	</div>
 
-	<umb-overlay
-		ng-if="treePickerOverlay.show"
-		model="treePickerOverlay"
-		position="right"
-		view="treePickerOverlay.view">
-	</umb-overlay>
-
 </div>