diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload.component.d.ts b/ng2-components/ng2-alfresco-upload/src/components/upload.component.d.ts
index 84f84fbbd1..4f77f6f2bf 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload.component.d.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload.component.d.ts
@@ -26,6 +26,7 @@ export declare class UploadComponent {
     filesUploadingList: FileModel[];
     constructor(el: ElementRef);
     onFilesAdded(files: any): void;
+    onFilesDragged(files: any): void;
     showUndoNotificationBar(latestFilesAdded: any): void;
     showDialog(): void;
 }
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload.component.html b/ng2-components/ng2-alfresco-upload/src/components/upload.component.html
index 45035ed5e6..c25f4959d7 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload.component.html
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload.component.html
@@ -24,7 +24,7 @@
 
     <br><br>
 
-    <div file-draggable id='UploadBorder' class="upload-border" (onFilesAdded)="onFilesAdded($event)"
+    <div file-draggable id='UploadBorder' class="upload-border" (onFilesAdded)="onFilesDragged($event)"
          dropzone="" webkitdropzone="copy file:image/png file:image/gif file:image/jpeg" #droparea>
         Drop Area
     </div>
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload.component.js b/ng2-components/ng2-alfresco-upload/src/components/upload.component.js
index 67e0db04d4..e379621948 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload.component.js
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload.component.js
@@ -65,18 +65,24 @@ System.register(['angular2/core', '../services/upload.service', './file-uploadin
                     });
                 }
                 UploadComponent.prototype.onFilesAdded = function (files) {
-                    var latestFilesAdded = [];
-                    if (componentHandler) {
-                        componentHandler.upgradeAllRegistered();
-                    }
                     if (files.length) {
-                        latestFilesAdded = this._uploaderService.addToQueue(files);
+                        var latestFilesAdded = this._uploaderService.addToQueue(files);
                         this.filesUploadingList = this._uploaderService.getQueue();
                         this.showDialog();
                         this.showUndoNotificationBar(latestFilesAdded);
                     }
                 };
+                UploadComponent.prototype.onFilesDragged = function (files) {
+                    if (files.length) {
+                        this._uploaderService.addToQueue(files);
+                        this.filesUploadingList = this._uploaderService.getQueue();
+                        this.showDialog();
+                    }
+                };
                 UploadComponent.prototype.showUndoNotificationBar = function (latestFilesAdded) {
+                    if (componentHandler) {
+                        componentHandler.upgradeAllRegistered();
+                    }
                     this.undoNotificationBar.nativeElement.MaterialSnackbar.showSnackbar({
                         message: 'Upload in progress...',
                         timeout: 5000,
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload.component.js.map b/ng2-components/ng2-alfresco-upload/src/components/upload.component.js.map
index 3ace4f8de9..a08f6ac7d6 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload.component.js.map
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload.component.js.map
@@ -1 +1 @@
-{"version":3,"file":"upload.component.js","sourceRoot":"","sources":["upload.component.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAqBH;gBAeI,yBAAmB,EAAa;oBAAb,OAAE,GAAF,EAAE,CAAW;oBAVhC,WAAM,GAAU,KAAK,CAAC;oBAQtB,uBAAkB,GAAgB,EAAE,CAAC;oBAGjC,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,EAAE,CAAC,CAAC;oBAE/C,IAAI,CAAC,gBAAgB,GAAG,IAAI,8BAAa,CAAC;wBACtC,GAAG,EAAE,wDAAwD;wBAC7D,eAAe,EAAE,IAAI;wBACrB,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC;wBAC9B,eAAe,EAAE,OAAO;wBACxB,SAAS,EAAE,UAAU;wBACrB,UAAU,EAAE;4BACR,MAAM,EAAE,OAAO;4BACf,WAAW,EAAE,iBAAiB;yBACjC;qBACJ,CAAC,CAAC;gBACP,CAAC;gBAED,sCAAY,GAAZ,UAAa,KAAK;oBACd,IAAI,gBAAgB,GAAgB,EAAE,CAAC;oBACvC,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;wBACnB,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;oBAC5C,CAAC;oBAED,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;wBACf,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;wBAC3D,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;wBAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;wBAClB,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;oBACnD,CAAC;gBACL,CAAC;gBAED,iDAAuB,GAAvB,UAAwB,gBAAgB;oBACpC,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC;wBACjE,OAAO,EAAE,uBAAuB;wBAChC,OAAO,EAAE,IAAI;wBACb,aAAa,EAAE;4BACX,gBAAgB,CAAC,OAAO,CAAC,UAAC,kBAAkB;gCACxC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;4BAClC,CAAC,CAAC,CAAC;wBACP,CAAC;wBACD,UAAU,EAAE,MAAM;qBACrB,CAAC,CAAC;gBACP,CAAC;gBAED,oCAAU,GAAV;oBACI,IAAI,CAAC,4BAA4B,CAAC,UAAU,EAAE,CAAC;gBACnD,CAAC;gBAxDD;oBAAC,YAAK,EAAE;;+DAAA;gBAGR;oBAAC,gBAAS,CAAC,qBAAqB,CAAC;;4EAAA;gBAGjC;oBAAC,gBAAS,CAAC,qBAAqB,CAAC;;qFAAA;gBAjBrC;oBAAC,gBAAS,CAAC;wBACP,QAAQ,EAAE,iBAAiB;wBAC3B,QAAQ,EAAE,YAAY;wBACtB,UAAU,EAAE,CAAC,2CAAmB,EAAE,iDAAsB,EAAE,8DAA4B,CAAC;wBACvF,WAAW,EAAE,yBAAyB;wBACtC,SAAS,EAAE,CAAC,wBAAwB,CAAC;qBACxC,CAAC;;mCAAA;gBA8DF,sBAAC;YAAD,CAAC,AA7DD,IA6DC;YA7DD,6CA6DC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"upload.component.js","sourceRoot":"","sources":["upload.component.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAqBH;gBAeI,yBAAmB,EAAa;oBAAb,OAAE,GAAF,EAAE,CAAW;oBAVhC,WAAM,GAAU,KAAK,CAAC;oBAQtB,uBAAkB,GAAgB,EAAE,CAAC;oBAGjC,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,EAAE,CAAC,CAAC;oBAE/C,IAAI,CAAC,gBAAgB,GAAG,IAAI,8BAAa,CAAC;wBACtC,GAAG,EAAE,wDAAwD;wBAC7D,eAAe,EAAE,IAAI;wBACrB,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC;wBAC9B,eAAe,EAAE,OAAO;wBACxB,SAAS,EAAE,UAAU;wBACrB,UAAU,EAAE;4BACR,MAAM,EAAE,OAAO;4BACf,WAAW,EAAE,iBAAiB;yBACjC;qBACJ,CAAC,CAAC;gBACP,CAAC;gBAED,sCAAY,GAAZ,UAAa,KAAK;oBACd,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;wBACf,IAAI,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;wBAC/D,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;wBAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;wBAClB,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;oBACnD,CAAC;gBACL,CAAC;gBAED,wCAAc,GAAd,UAAe,KAAK;oBAChB,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;wBACf,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;wBACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;wBAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;oBACtB,CAAC;gBACL,CAAC;gBAED,iDAAuB,GAAvB,UAAwB,gBAAgB;oBACpC,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;wBACnB,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;oBAC5C,CAAC;oBAED,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC;wBACjE,OAAO,EAAE,uBAAuB;wBAChC,OAAO,EAAE,IAAI;wBACb,aAAa,EAAE;4BACX,gBAAgB,CAAC,OAAO,CAAC,UAAC,kBAAkB;gCACxC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;4BAClC,CAAC,CAAC,CAAC;wBACP,CAAC;wBACD,UAAU,EAAE,MAAM;qBACrB,CAAC,CAAC;gBACP,CAAC;gBAED,oCAAU,GAAV;oBACI,IAAI,CAAC,4BAA4B,CAAC,UAAU,EAAE,CAAC;gBACnD,CAAC;gBA/DD;oBAAC,YAAK,EAAE;;+DAAA;gBAGR;oBAAC,gBAAS,CAAC,qBAAqB,CAAC;;4EAAA;gBAGjC;oBAAC,gBAAS,CAAC,qBAAqB,CAAC;;qFAAA;gBAjBrC;oBAAC,gBAAS,CAAC;wBACP,QAAQ,EAAE,iBAAiB;wBAC3B,QAAQ,EAAE,YAAY;wBACtB,UAAU,EAAE,CAAC,2CAAmB,EAAE,iDAAsB,EAAE,8DAA4B,CAAC;wBACvF,WAAW,EAAE,yBAAyB;wBACtC,SAAS,EAAE,CAAC,wBAAwB,CAAC;qBACxC,CAAC;;mCAAA;gBAqEF,sBAAC;YAAD,CAAC,AApED,IAoEC;YApED,6CAoEC,CAAA"}
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload.component.ts
index 35b1549c56..c27fbe5727 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload.component.ts
@@ -66,20 +66,27 @@ export class UploadComponent {
     }
 
     onFilesAdded(files):void {
-        let latestFilesAdded:FileModel [] = [];
-        if (componentHandler) {
-            componentHandler.upgradeAllRegistered();
-        }
-
         if (files.length) {
-            latestFilesAdded = this._uploaderService.addToQueue(files);
+            let latestFilesAdded = this._uploaderService.addToQueue(files);
             this.filesUploadingList = this._uploaderService.getQueue();
             this.showDialog();
             this.showUndoNotificationBar(latestFilesAdded);
         }
     }
 
+    onFilesDragged(files):void {
+        if (files.length) {
+            this._uploaderService.addToQueue(files);
+            this.filesUploadingList = this._uploaderService.getQueue();
+            this.showDialog();
+        }
+    }
+
     showUndoNotificationBar(latestFilesAdded){
+        if (componentHandler) {
+            componentHandler.upgradeAllRegistered();
+        }
+
         this.undoNotificationBar.nativeElement.MaterialSnackbar.showSnackbar({
             message: 'Upload in progress...',
             timeout: 5000,