diff --git a/static/js/document.js b/static/js/document.js
index a13332d2..1f517fab 100644
--- a/static/js/document.js
+++ b/static/js/document.js
@@ -80,7 +80,7 @@ pandora.ui.document = function() {
                     imageHeight: item.dimensions[1],
                     imagePreviewURL: pandora.getMediaURL('/documents/' + item.id + '/256p.jpg?' + item.modified),
                     imageURL: pandora.getMediaURL('/documents/' + item.id + '/'
-                        + item.title + '.' + item.extension + '?' + item.modified),
+                        + pandora.safePDFName(item.title) + '.' + item.extension + '?' + item.modified),
                     imageWidth: item.dimensions[0],
                     width: that.width()
                 }).css({
diff --git a/static/js/utils.js b/static/js/utils.js
index ae2758cc..c3978345 100644
--- a/static/js/utils.js
+++ b/static/js/utils.js
@@ -424,7 +424,10 @@ pandora.uploadDroppedFiles = function(files) {
             }
         }).open();
     } else {
-        pandora.ui.addItemDialog({files: files}).open()
+        pandora.ui.addItemDialog({
+            files: files,
+            selected: 'upload'
+        }).open()
     }
 };