diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js
index e5228ca249..a8b4d3f6c5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.controller.js
@@ -1,4 +1,15 @@
 angular.module("umbraco")
+.directive("umbUploadPreview",function($parse){
+        return {
+            link: function(scope, element, attr, ctrl) {
+               var fn = $parse(attr.umbUploadPreview),
+                                   file = fn(scope);
+                if (file.preview) {
+                   element.append(file.preview);
+               }
+            }
+        };
+})
 .controller("Umbraco.Editors.FolderBrowserController",
     function ($rootScope, $scope, assetsService, $routeParams, $timeout, umbRequestHelper, mediaResource, imageHelper) {
         var dialogOptions = $scope.$parent.dialogOptions;
@@ -39,7 +50,7 @@ angular.module("umbraco")
             console.log('processing');
 
             $scope.$apply(function() {
-                $scope.filesUploading.push(data.files[data.index].preview);
+                $scope.filesUploading.push(data.files[data.index]);
             });
         })
 
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 e415ed4a11..0640fd9e96 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
@@ -13,7 +13,9 @@ data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
         <div class="umb-upload-upload-progress" ng-show="filesUploading.length">
             NOW UPLOADING...
             <ul>
-                <li ng-repeat="file in filesUploading">{{file | json}}</li>
+                <li ng-repeat="file in filesUploading">
+                    <div umb-upload-preview="file"></div>
+                </li>
             </ul>
         </div>
 
@@ -21,7 +23,8 @@ data-ng-class="{'fileupload-processing': processing() || loadingFiles}">
         <ul class="umb-thumbnails thumbnails">
 	        <li class="span2 folder" ng-repeat="image in images | orderBy:'contentTypeAlias' | filter:searchTerm">
 			    <a href="#/media/media/edit/{{image.id}}" class="thumbnail">
-					<img ng-src="{{image.thumbnail}}" ng-switch-when="Image" alt="{{image.name}}"/>	
+					
+
                     <div ng-switch on="!!image.thumbnail" >
                         <img ng-src="{{image.thumbnail}}" class="image" ng-switch-when="true" alt="{{image.name}}"/>