diff --git a/lib/client/listeners.js b/lib/client/listeners.js
index 9df12933..5bbfebaa 100644
--- a/lib/client/listeners.js
+++ b/lib/client/listeners.js
@@ -341,10 +341,15 @@ var Util, DOM, CloudFunc, CloudCmd;
                     
                     event.preventDefault();
                     
-                    if (items && items.length && items[0].webkitGetAsEntry)
-                        DOM.uploadDirectory(items);
-                    else
+                    if (items && items.length && items[0].webkitGetAsEntry) {
+                        files = [].filter.call(items, function(item) {
+                            return item.kind === 'file';
+                        });
+                        
+                        DOM.uploadDirectory(files);
+                    } else {
                         DOM.uploadFiles(files);
+                    }
                 },
                 /**
                  * In Mac OS Chrome dropEffect = 'none'