diff --git a/lib/client/listeners.js b/lib/client/listeners.js
index 46f7e3cc..9df12933 100644
--- a/lib/client/listeners.js
+++ b/lib/client/listeners.js
@@ -341,7 +341,7 @@ var Util, DOM, CloudFunc, CloudCmd;
                     
                     event.preventDefault();
                     
-                    if (items && items[0].webkitGetAsEntry)
+                    if (items && items.length && items[0].webkitGetAsEntry)
                         DOM.uploadDirectory(items);
                     else
                         DOM.uploadFiles(files);