diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html
index bf45d04ea5..79d0ff9b0c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html
+++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html
@@ -7,9 +7,8 @@ data-file-upload-progress=""
 data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
         
 
-        <span class="btn fileinput-button umb-upload-button-big" 
-        ng-class="{disabled: disabled}" ng-show="touchDevice || images.length === 0">
-
+        <span class="fileinput-button umb-upload-button-big" 
+            ng-class="{disabled: disabled}">
             <i class="icon icon-page-up"></i>
             <p>Click to upload</p>
             <input type="file" name="files[]" multiple ng-disabled="disabled">
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index 4637a0e898..77b03833e6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -29,7 +29,7 @@ function mediaEditController($scope, $routeParams, mediaResource, navigationServ
                 // after the redirect, so we will bind all subscriptions which will show the server validation errors
                 // if there are any and then clear them so the collection no longer persists them.
                 serverValidationManager.executeAndClearAllSubscriptions();
-
+                navigationService.syncPath(data.path, true);
             });
     }
     
@@ -61,6 +61,7 @@ function mediaEditController($scope, $routeParams, mediaResource, navigationServ
                         rebindCallback: contentEditingHelper.reBindChangedProperties($scope.content, data)
                     });
 
+                    navigationService.syncPath(data.path, true);
                 }, function(err) {
 
                     contentEditingHelper.handleSaveError({
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
index 90669a9bbc..1c9b70c077 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
@@ -7,14 +7,13 @@ data-file-upload-progress=""
 ng-hide="creating" 
 data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
         
-		<span class="fileinput-button umb-upload-button-big" 
-            ng-show="touchDevice || images.length === 0"
+        <span class="fileinput-button umb-upload-button-big" 
             ng-hide="dropping"
             ng-class="{disabled: disabled}">
-		    <i class="icon icon-page-up"></i>
-		    <p>Click to upload</p>
-		    <input type="file" name="files[]" multiple ng-disabled="disabled">
-		</span>
+            <i class="icon icon-page-up"></i>
+            <p>Click to upload</p>
+            <input type="file" name="files[]" multiple ng-disabled="disabled">
+        </span>
 
         <umb-upload-dropzone dropping="dropping" files="filesUploading">
         </umb-upload-dropzone>
@@ -23,6 +22,7 @@ data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
             min-height="220" 
             min-width="220"
             on-click="clickHandler"
-            ng-model="images"
-        />
+            ng-model="images"/>
+
+        
 </form>
\ No newline at end of file