diff --git a/files/css/files.css b/files/css/files.css
index 4d2b749bf8..544b323bb2 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -62,6 +62,7 @@ table tr[data-type="dir"] td.filename a.name {font-weight:bold; }
 table td.filename a.name input, table td.filename a.name form { width:100%; cursor:text; }
 table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
 table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
+// TODO fix usability bug (accidental file/folder selection)
 //table td.filename .nametext { width:60%; }
 table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
 table td.filename form { float:left; font-size:.85em; }
diff --git a/files/js/files.js b/files/js/files.js
index 89101ce4b8..a7a4d3077c 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -172,6 +172,7 @@ $(document).ready(function() {
 	});
 
 	// drag&drop support using jquery.fileupload
+	// TODO use OC.dialogs
 	$(document).bind('drop dragover', function (e) {
 			e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
 	});
@@ -242,6 +243,7 @@ $(document).ready(function() {
 									$('#notification').fadeIn();
 								}
 							});
+							uploadingFiles[dirName+"/"+files[i].name] = jqXHR;
 						} else {
 							var jqXHR =  $('.file_upload_start').fileupload('send', {files: files[i]})
 									.success(function(result, textStatus, jqXHR) {
@@ -270,8 +272,8 @@ $(document).ready(function() {
 									$('#notification').fadeIn();
 								}
 							});
+							uploadingFiles[files[i].name] = jqXHR;
 						}
-						uploadingFiles[files[i].name] = jqXHR;
 					}
 				}else{
 					data.submit().success(function(data, status) {