diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js
index 06176cd6c0..305790a59d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/contentpicker.controller.js
@@ -8,7 +8,6 @@ angular.module("umbraco").controller("Umbraco.Dialogs.ContentPickerController",
 		args.event.preventDefault();
 		args.event.stopPropagation();
 
-
 		eventsService.publish("Umbraco.Dialogs.ContentPickerController.Select", args).then(function(args){
 			if(dialogOptions && dialogOptions.multipicker){
 				
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 75e9cf8a97..ebe9151b4f 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
@@ -1,13 +1,5 @@
 <div class="umb-panel" ng-controller="Umbraco.Dialogs.ContentPickerController">
-	<div class="umb-panel-header">
-		<div class="umb-el-wrap umb-panel-buttons">
-	        <div class="btn-toolbar umb-btn-toolbar">
-	         	<input type="button" ng-click="submit(dialogData)" class="btn btn-primary" value="select" />
-	        </div>
-		</div>
-	</div>
-	
-	<div class="umb-panel-body umb-scrollable" auto-scale="1">
+	<div class="umb-panel-body no-header">
 		<div class="tab-content umb-control-group">
 			<div class="umb-pane">
 				<umb-tree 
@@ -20,4 +12,12 @@
 			</div>
 		</div>
 	</div>
+
+	<div class="umb-panel-footer" ng-show="multipicker">
+		<div class="umb-el-wrap umb-panel-buttons">
+	        <div class="btn-toolbar umb-btn-toolbar">
+	         	<input type="button" ng-click="submit(dialogData)" class="btn btn-primary" value="select" />
+	        </div>
+		</div>
+	</div>
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html
index bf61c6eeb8..01120accf8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html
@@ -1,13 +1,5 @@
 <div class="umb-panel" ng-controller="Umbraco.Dialogs.TreePickerController">
-	<div class="umb-panel-header">
-		<div class="umb-el-wrap umb-panel-buttons">
-	        <div class="btn-toolbar umb-btn-toolbar">
-	         	<input type="button" ng-click="submit(dialogData)" class="btn btn-primary" value="select" />
-	        </div>
-		</div>
-	</div>
-	
-	<div class="umb-panel-body umb-scrollable">
+	<div class="umb-panel-body no-header umb-scrollable">
 		<div class="tab-content umb-control-group">
 			<div class="umb-pane">
 				<umb-tree 
@@ -21,4 +13,12 @@
 		</div>
 	</div>
 	
+	<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" />
+	        </div>
+		</div>
+	</div>
+
 </div>
\ No newline at end of file