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 91a228267b..d2ff7bd778 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
@@ -24,16 +24,33 @@ angular.module('umbraco')
 				});
 			});
 		}
-		
 
-		$scope.openContentPicker =function() {
-		    var d = dialogService.treePicker({
-		        section: config.type,
-		        treeAlias: config.treeAlias,
-		        multiPicker: config.multiPicker,
-		        callback: populate
-		    });
-		};
+		$scope.openContentPicker = function() {
+			$scope.treePickerOverlay = {};
+			$scope.treePickerOverlay.section = config.type;
+			$scope.treePickerOverlay.treeAlias = config.treeAlias;
+			$scope.treePickerOverlay.multiPicker = config.multiPicker;
+			$scope.treePickerOverlay.view = "treePicker";
+			$scope.treePickerOverlay.show = true;
+
+			$scope.treePickerOverlay.submit = function(model) {
+
+				if(config.multiPicker) {
+					populate(model.selection);
+				} else {
+					populate(model.selection[0]);
+				}
+
+				$scope.treePickerOverlay.show = false;
+				$scope.treePickerOverlay = null;
+			};
+
+			$scope.treePickerOverlay.close = function(oldModel) {
+				$scope.treePickerOverlay.show = false;
+				$scope.treePickerOverlay = null;
+			};
+
+		}
 
 		$scope.remove =function(index){
 			$scope.renderModel.splice(index, 1);
@@ -82,4 +99,4 @@ angular.module('umbraco')
 				$scope.add(data);
 			}
 		}
-});
\ No newline at end of file
+});
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 71ce43b883..fc7a388cc1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.html
@@ -19,4 +19,12 @@
 			</a>
 		</li>
 	</ul>
-</div>
\ No newline at end of file
+
+	<umb-overlay
+		ng-if="treePickerOverlay.show"
+		model="treePickerOverlay"
+		position="right"
+		view="treePickerOverlay.view">
+	</umb-overlay>
+
+</div>