diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
index 30af946da3..2c60a87db2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
@@ -13,8 +13,8 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat
         scope: {
             section: '@',
             treealias: '@',
-            showoptions: '@',
-            showheader: '@',
+            hideoptions: '@',
+            hideheader: '@',
             cachekey: '@',
             isdialog: '@',
             //Custom query string arguments to pass in to the tree as a string, example: "startnodeid=123&something=value"
@@ -24,18 +24,13 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat
 
         compile: function(element, attrs) {
             //config
-            var hideheader = (attrs.showheader === 'false') ? true : false;
-            var hideoptions = (attrs.showoptions === 'false') ? "hide-options" : "";
-
-            var template = '<ul class="umb-tree ' + hideoptions + '">' +
-                '<li class="root">';
-
-            if (!hideheader) {
-                template += '<div>' +
-                    '<h5><a href="#/{{section}}" ng-click="select(this, tree.root, $event)" on-right-click="altSelect(this, tree.root, $event)"  class="root-link">{{tree.name}}</a></h5>' +
-                    '<a href class="umb-options" ng-hide="tree.root.isContainer || !tree.root.menuUrl" ng-click="options(this, tree.root, $event)" ng-swipe-right="options(this, tree.root, $event)"><i></i><i></i><i></i></a>' +
-                    '</div>';
-            }
+            //var showheader = (attrs.showheader !== 'false');
+            var hideoptions = (attrs.hideoptions === 'true') ? "hide-options" : "";
+            var template = '<ul class="umb-tree ' + hideoptions + '"><li class="root">';
+            template += '<div ng-hide="hideheader">' +
+                '<h5><a href="#/{{section}}" ng-click="select(this, tree.root, $event)" on-right-click="altSelect(this, tree.root, $event)"  class="root-link">{{tree.name}}</a></h5>' +
+                '<a href class="umb-options" ng-hide="tree.root.isContainer || !tree.root.menuUrl" ng-click="options(this, tree.root, $event)" ng-swipe-right="options(this, tree.root, $event)"><i></i><i></i><i></i></a>' +
+                '</div>';
             template += '<ul>' +
                 '<umb-tree-item ng-repeat="child in tree.root.children" eventhandler="eventhandler" node="child" current-node="currentNode" tree="child" section="{{section}}" ng-animate="animation()"></umb-tree-item>' +
                 '</ul>' +
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 7890421360..0932b63286 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
@@ -38,8 +38,7 @@
 		<div ng-hide="showSearch">
 			<umb-tree 
 				section="content" 
-				showheader="true" 
-				showoptions="false"
+				hideoptions="true"
                 isdialog="true"
 				eventhandler="dialogTreeEventHandler">
 			</umb-tree>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
index b3cd07cb44..bf01c5e23c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
@@ -22,8 +22,8 @@
 
 		<umb-tree 
 			section="content" 
-			showheader="true" 
-			showoptions="false"
+			hideheader="false" 
+			hideoptions="true"
 			eventhandler="dialogTreeEventHandler">
 		</umb-tree>
 	</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
index a4c4b82638..0b834d6cf5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
@@ -57,9 +57,8 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
         	min-width="220"
         	on-click="clickHandler"
         	ng-model="images"
-        	filter-by="searchTerm"
-        />
-	</div>
+        	filter-by="searchTerm"/>
+	</div>	
 
 	<div class="umb-panel-footer" >
 			<div class="umb-el-wrap umb-panel-buttons">
@@ -69,6 +68,13 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
 		        		<localize key="general_cancel">Cancel</localize>
 					</a>
 
+					<button
+						class="btn"
+						ng-hide="onlyImages || dialogOptions.multiPicker"
+						ng-click="selectFolder(currentFolder)">
+						<localize key="buttons_selectCurrentFolder">Select current folder</localize>
+					</button>
+
 					<button
 						class="btn btn-primary"
 						ng-show="dialogOptions.multiPicker" 
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 fdd2aa7378..339d1f6c88 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
@@ -7,8 +7,8 @@
 				<umb-tree 
 				    section="member" 
                     treealias="memberGroup"
-					showheader="false" 
-				    showoptions="false"
+					hideheader="true" 
+				    hideoptions="true"
                     isdialog="true"
 					eventhandler="dialogTreeEventHandler">
 				</umb-tree>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html
index 360fbb3d63..e36f1bf724 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.html
@@ -39,8 +39,8 @@
 				<umb-tree 
 				    section="member" 
                     treealias="member"
-					showheader="false" 
-				    showoptions="false"
+					hideheader="true" 
+				    hideoptions="true"
                     isdialog="true"
 					eventhandler="dialogTreeEventHandler">
 				</umb-tree>
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
index 556145c3cc..0ae5c667f4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
@@ -7,7 +7,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController",
 		$scope.section = dialogOptions.section;
 		$scope.treeAlias = dialogOptions.treeAlias;
 		$scope.multiPicker = dialogOptions.multiPicker;
-		
+		$scope.hideHeader = dialogOptions.startNodeId ? true : false;
 		$scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
 
 	    //create the custom query string param for this tree
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 c37717929e..13da681dd9 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
@@ -37,8 +37,8 @@
                 <umb-tree
                     section="{{section}}"
                     treealias="{{treeAlias}}"
-                    showheader="true"
-                    showoptions="false"
+                    hideheader="{{hideHeader}}"
+                    hideoptions="true"
                     isdialog="true"
                     customtreeparams="{{customTreeParams}}"
                     eventhandler="dialogTreeEventHandler">
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index 769347589f..10f9c5c21e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -21,8 +21,8 @@
 		<div ng-hide="success">
 			<umb-tree
 				section="content" 
-				showheader="true" 
-				showoptions="false"
+				hideheader="false" 
+				hideoptions="true"
                 isdialog="true"
 				eventhandler="dialogTreeEventHandler">
 			</umb-tree>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
index fba9bc7e14..bbbb9a99f2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/move.html
@@ -21,8 +21,8 @@
 		<div ng-hide="success">
 			<umb-tree
 				section="content" 
-				showheader="true" 
-				showoptions="false"
+				hideheader="false" 
+				hideoptions="true"
                 isdialog="true"
 				eventhandler="dialogTreeEventHandler">
 			</umb-tree>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/move.html b/src/Umbraco.Web.UI.Client/src/views/media/move.html
index eb84a48b7f..cbd58f0a14 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/move.html
@@ -21,8 +21,8 @@
 		<div ng-hide="success">
 			<umb-tree
 				section="media" 
-				showheader="true" 
-				showoptions="false"
+				hideheader="false" 
+				hideoptions="true"
 				eventhandler="dialogTreeEventHandler">
 			</umb-tree>
 		</div>
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index a7a975414a..c1e6be9196 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -79,7 +79,7 @@ namespace Umbraco.Web.Trees
                 var altStartId = string.Empty;
                 
                 if(queryStrings.HasKey(TreeQueryStringParameters.StartNodeId))
-                    queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId);
+                    altStartId = queryStrings.GetValue<string>(TreeQueryStringParameters.StartNodeId);
 
 
                 //check if a request has been made to render from a specific start node