diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.controller.js
index 40d5e1d7bb..e3c8f4fb85 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.controller.js
@@ -30,23 +30,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.MemberGroupPickerControlle
             }
         }
 
-        $scope.performSearch = function() {
-            if ($scope.term) {
-                if ($scope.oldTerm !== $scope.term) {
-                    $scope.results = [];
-                    searchService.searchMembers({ term: $scope.term }).then(function(data) {
-                        $scope.results = data;
-                    });
-                    $scope.showSearch = true;
-                    $scope.oldTerm = $scope.term;
-                }
-            }
-            else {
-                $scope.oldTerm = "";
-                $scope.showSearch = false;
-                $scope.results = [];
-            }
-        };
+
 
         /** method to select a search result */
         $scope.selectResult = function(result) {
@@ -58,11 +42,8 @@ angular.module("umbraco").controller("Umbraco.Dialogs.MemberGroupPickerControlle
             args.event.preventDefault();
             args.event.stopPropagation();
 
-            if (args.node.nodeType === "member-folder") {
-                return;
-            }
 
-            eventsService.publish("Umbraco.Dialogs.MemberPickerController.Select", args).then(function(a) {
+            eventsService.publish("Umbraco.Dialogs.MemberGroupPickerController.Select", args).then(function(a) {
 
                 //This is a tree node, so we don't have an entity to pass in, it will need to be looked up
                 //from the server in this method.
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html
index 315a1a2673..6a8a0e3551 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/membergrouppicker.html
@@ -1,45 +1,13 @@
 <div class="umb-panel" ng-controller="Umbraco.Dialogs.MemberGroupPickerController">
-	<div class="umb-panel-header">
-		<div class="umb-el-wrap umb-panel-buttons">
-			        <div class="form-search">
-	                    <i class="icon-search"></i>
-	                    <input type="text" 
-	                           ng-model="term" 
-	                           class="umb-search-field search-query" 
-	                           placeholder="Filter..."
-	                           on-keyup="performSearch()">
-	                </div>
-	    </div>
-	</div>
+	
 	<div class="umb-panel-body with-footer">
-		<!-- Search results -->
-		<div id="search-results" ng-show="showSearch">
-			<ul class="umb-tree">
-		        <li class="root">
-		            <ul class="umb-search-group" >
-		                <li ng-repeat="result in results">
-		                    <div style="padding-left: 20px">
-		                    <a ng-class="{first:$first}" ng-click="selectResult(result)">
-		                           <i 
-		                            class="icon umb-tree-icon sprTree {{result.icon}}"></i>
-		                            {{result.name}}
-                                    <small class="search-subtitle" ng-show="result.subTitle">
-                                        {{result.subTitle}}
-                                    </small>
-		                        </a>
-		                    </div>
-		                </li>
-		            </ul>
 
-		        </li>
-		    </ul>    
-		</div>
 
 		<div ng-hide="showSearch">
 				<umb-tree 
 				    section="member" 
-                    treealias="member"
-				    cachekey="memberpickerDialog" 
+                    treealias="memberGroup"
+				    cachekey="membergrouppickerDialog" 
 					showheader="false" 
 				    showoptions="false"
                     isdialog="true"