diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html
index 32109e5fcd..e99fc2582e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.html
@@ -19,7 +19,7 @@
 		            <ul class="umb-search-group" ng-repeat="resultGroup in results">
 		                <li ng-repeat="result in resultGroup.matches">
 		                    <div style="padding-left: 20px">
-		                    <a ng-class="{first:$first}" ng-click="select(result)">
+		                    <a ng-class="{first:$first}" ng-click="selectResult(result)">
 		                           <i 
 		                            class="icon umb-tree-icon sprTree {{resultGroup.icon}}"></i>
 		                            {{result.title}}
@@ -49,7 +49,7 @@
 	<div class="umb-panel-footer" ng-show="multipicker">
 		<div class="umb-el-wrap umb-panel-buttons">
 	        <div class="btn-toolbar umb-btn-toolbar pull-right">
-	         	<input type="button" ng-click="submit(dialogData)" class="btn btn-primary" value="select" />
+	         	<input type="button" ng-click="submit(dialogData.selection)" class="btn btn-primary" value="select" />
 	        </div>
 		</div>
 	</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 4870733f51..7928c1a9ed 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -6,7 +6,11 @@ angular.module('umbraco')
 	function($scope, dialogService, entityResource, $log, iconHelper){
 		$scope.ids = $scope.model.value.split(',');
 		$scope.renderModel = [];
-		$scope.multipicker = true;
+		$scope.cfg = {multipicker: false};
+
+		if($scope.config){
+			$scope.cfg = $scope.config;
+		}
 
 		entityResource.getByIds($scope.ids, "Document").then(function(data){
 			$(data).each(function(i, item){
@@ -16,7 +20,7 @@ angular.module('umbraco')
 		});
 
 		$scope.openContentPicker =function(){
-			var d = dialogService.contentPicker({scope: $scope, multipicker: $scope.multipicker, callback: populate});
+			var d = dialogService.contentPicker({scope: $scope, multipicker: $scope.cfg.multipicker, callback: populate});
 		};
 
 		$scope.remove =function(index){