diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
new file mode 100644
index 0000000000..8e70ad163c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
@@ -0,0 +1,34 @@
+<div ng-controller="Umbraco.Overlays.TreePickerController" ng-init="init('content')">
+
+   <div class="umb-control-group">
+      <umb-tree-search-box
+         hide-search-callback="hideSearch"
+         search-callback="onSearchResults"
+         search-from-id="{{searchInfo.searchFromId}}"
+         search-from-name="{{searchInfo.searchFromName}}"
+         show-search="{{searchInfo.showSearch}}"
+         section="content">
+      </umb-tree-search-box>
+   </div>
+
+   <umb-tree-search-results
+      ng-if="searchInfo.showSearch"
+      results="searchInfo.results"
+      select-result-callback="selectResult">
+   </umb-tree-search-results>
+
+   <div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
+      <umb-tree
+         section="content"
+         treealias="content"
+         hideheader="{{hideHeader}}"
+         hideoptions="true"
+         isdialog="true"
+         customtreeparams="{{customTreeParams}}"
+         eventhandler="dialogTreeEventHandler"
+         enablelistviewsearch="true"
+         enablecheckboxes="{{multiPicker}}">
+      </umb-tree>
+   </div>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html
new file mode 100644
index 0000000000..e4a8d36263
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/memberpicker/memberpicker.html
@@ -0,0 +1,34 @@
+<div ng-controller="Umbraco.Overlays.TreePickerController" ng-init="init('member')">
+
+   <div class="umb-control-group">
+      <umb-tree-search-box
+         hide-search-callback="hideSearch"
+         search-callback="onSearchResults"
+         search-from-id="{{searchInfo.searchFromId}}"
+         search-from-name="{{searchInfo.searchFromName}}"
+         show-search="{{searchInfo.showSearch}}"
+         section="member">
+      </umb-tree-search-box>
+   </div>
+
+   <umb-tree-search-results
+      ng-if="searchInfo.showSearch"
+      results="searchInfo.results"
+      select-result-callback="selectResult">
+   </umb-tree-search-results>
+
+   <div ng-hide="searchInfo.showSearch" ng-animate="'tree-fade-out'">
+      <umb-tree
+         section="member"
+         treealias="member"
+         hideheader="{{hideHeader}}"
+         hideoptions="true"
+         isdialog="true"
+         customtreeparams="{{customTreeParams}}"
+         eventhandler="dialogTreeEventHandler"
+         enablelistviewsearch="true"
+         enablecheckboxes="{{multiPicker}}">
+      </umb-tree>
+   </div>
+
+</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
index b3ce508f47..76fc8509ce 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
@@ -19,6 +19,17 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
 
 		  $scope.model.selection = [];
 
+		  $scope.init = function(contentType) {
+
+			  if(contentType === "content") {
+				  entityType = "Document";
+			  } else if(contentType === "member") {
+				  entityType = "Member";
+			  } else if(contentType === "media") {
+				  entityType = "Media";
+			  }
+		  }
+
 	    //create the custom query string param for this tree
 	    $scope.customTreeParams = dialogOptions.startNodeId ? "startNodeId=" + dialogOptions.startNodeId : "";
 	    $scope.customTreeParams += dialogOptions.customTreeParams ? "&" + dialogOptions.customTreeParams : "";