diff --git a/dashboard-ui/components/imagedownloader/imagedownloader.js b/dashboard-ui/components/imagedownloader/imagedownloader.js
index 9503960cf..27baed54b 100644
--- a/dashboard-ui/components/imagedownloader/imagedownloader.js
+++ b/dashboard-ui/components/imagedownloader/imagedownloader.js
@@ -6,7 +6,7 @@
     var hasChanges = false;
 
     // These images can be large and we're seeing memory problems in safari
-    var browsableImagePageSize = browserInfo.safari ? 6 : (browserInfo.mobile ? 10 : 30);
+    var browsableImagePageSize = browserInfo.safari ? 6 : (browserInfo.mobile ? 10 : 40);
 
     var browsableImageStartIndex = 0;
     var browsableImageType = 'Primary';
diff --git a/dashboard-ui/components/imageeditor/imageeditor.js b/dashboard-ui/components/imageeditor/imageeditor.js
index fd8814171..89752aee6 100644
--- a/dashboard-ui/components/imageeditor/imageeditor.js
+++ b/dashboard-ui/components/imageeditor/imageeditor.js
@@ -206,11 +206,14 @@
 
         $('.btnOpenUploadMenu', page).on('click', function () {
 
+            var imageType = this.getAttribute('data-imagetype');
+
             require(['components/imageuploader/imageuploader'], function (imageUploader) {
 
                 imageUploader.show(currentItem.Id, {
 
-                    theme: options.theme
+                    theme: options.theme,
+                    imageType: imageType
 
                 }).then(function (hasChanged) {
 
diff --git a/dashboard-ui/components/imageeditor/imageeditor.template.html b/dashboard-ui/components/imageeditor/imageeditor.template.html
index 545707ff2..48e193a84 100644
--- a/dashboard-ui/components/imageeditor/imageeditor.template.html
+++ b/dashboard-ui/components/imageeditor/imageeditor.template.html
@@ -13,7 +13,7 @@
     <div>
         <h1 style="display:inline-block;vertical-align:middle;">${HeaderBackdrops}</h1>
         <paper-fab icon="search" mini class="btnBrowseAllImages subdued" style="vertical-align:middle;margin-left:1em;" data-imagetype="Backdrop"></paper-fab>
-        <paper-fab icon="add" mini class="btnOpenUploadMenu subdued" style="vertical-align:middle;margin-left:.25em;"></paper-fab>
+        <paper-fab icon="add" mini class="btnOpenUploadMenu subdued" style="vertical-align:middle;margin-left:.25em;" data-imagetype="Backdrop"></paper-fab>
     </div>
     <div id="backdrops">
     </div>
@@ -24,7 +24,7 @@
     <div>
         <h1 style="display:inline-block;vertical-align:middle;">${Screenshots}</h1>
         <paper-fab icon="search" mini class="btnBrowseAllImages subdued" style="vertical-align:middle;margin-left:1em;" data-imagetype="Screenshot"></paper-fab>
-        <paper-fab icon="add" mini class="btnOpenUploadMenu subdued" style="vertical-align:middle;margin-left:.25em;"></paper-fab>
+        <paper-fab icon="add" mini class="btnOpenUploadMenu subdued" style="vertical-align:middle;margin-left:.25em;" data-imagetype="Screenshot"></paper-fab>
     </div>
     <div id="screenshots">
     </div>
diff --git a/dashboard-ui/components/imageuploader/imageuploader.js b/dashboard-ui/components/imageuploader/imageuploader.js
index 085b5f158..1dbb5062c 100644
--- a/dashboard-ui/components/imageuploader/imageuploader.js
+++ b/dashboard-ui/components/imageuploader/imageuploader.js
@@ -164,6 +164,8 @@
             var editorContent = dlg.querySelector('.editorContent');
             initEditor(editorContent);
 
+            $('#selectImageType', dlg).val(options.imageType || 'Primary');
+
             $('.btnCloseDialog', dlg).on('click', function () {
 
                 paperDialogHelper.close(dlg);