diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.html
index 7395416217..3bd3bc686b 100644
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.html
+++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.html
@@ -40,8 +40,8 @@
                 <li>
                     <ul class="media-items">
                         <li ng-repeat="child in currentFolder.children | orderBy:'isFolder':true">
-                            <div ng-if="!child.isFolder" class=" media-preview" ng-class="{selected:selectedMedia.id == child.id}" ng-click="selectMedia(child)" style="background-image: url({{ child.thumbnail }})"></div>
-                            <div ng-if="child.isFolder" class=" media-preview" ng-click="selectMedia(child)">
+                            <div ng-if="!child.isFolder" class="media-preview" ng-class="{selected:selectedMedia.id == child.id}" ng-click="selectMedia(child)" style="background-image: url({{ child.thumbnail }})"></div>
+                            <div ng-if="child.isFolder" class="media-preview" ng-click="selectMedia(child)">
                                 <i class="icon icon-folder folder"><p class="folder-name">{{child.name}}</p></i>
                             </div>
                         </li>
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.js b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.js
index 2f99988f48..6d6bddb5a2 100644
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.js
+++ b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.js
@@ -128,12 +128,11 @@ angular.module("Umbraco.canvasdesigner")
                 angular.forEach(folder.children, function (child) {
                     child.isFolder = child.contentTypeAlias == "Folder" ? true : false;
                     if (!child.isFolder) {
-                        angular.forEach(child.properties, function (property) {
-                            // TODO, resolve with thumbnail
-                            if (property.alias = "umbracoFile" && property.value.src)
+                        angular.forEach(child.properties, function (property) {       
+                            if (property.alias == "umbracoFile" && property.value)
                             {
-                                child.thumbnail = property.value.src;
-                                child.image = property.value.src;
+                                child.thumbnail = mediaHelper.resolveFile(child, true);
+                                child.image = property.value;
                             }
                         })
                     }