diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
index 2f3d6af5..1157a540 100644
--- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
+++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
@@ -59,23 +59,21 @@ let FileDragAndDrop = React.createClass({
     handleDrop(event) {
         event.preventDefault();
         event.stopPropagation();
-        let files;
 
-        if(this.props.dropzoneInactive) {
-            return;
+        if (!this.props.dropzoneInactive) {
+            let files;
+
+            // handle Drag and Drop
+            if(event.dataTransfer && event.dataTransfer.files.length > 0) {
+                files = event.dataTransfer.files;
+            } else if(event.target.files) { // handle input type file
+                files = event.target.files;
+            }
+
+            if(typeof this.props.onDrop === 'function' && files) {
+              this.props.onDrop(files);
+            }
         }
-
-        // handle Drag and Drop
-        if(event.dataTransfer && event.dataTransfer.files.length > 0) {
-            files = event.dataTransfer.files;
-        } else if(event.target.files) { // handle input type file
-            files = event.target.files;
-        }
-
-        if(typeof this.props.onDrop === 'function' && files) {
-          this.props.onDrop(files);
-        }
-
     },
 
     handleDeleteFile(fileId) {
@@ -107,28 +105,25 @@ let FileDragAndDrop = React.createClass({
     },
 
     handleOnClick() {
-        let evt;
-        // when multiple is set to false and the user already uploaded a piece,
-        // do not propagate event
-        if(this.props.dropzoneInactive) {
-            // if there is a handle function for doing stuff
-            // when the dropzone is inactive, then call it
-            return;
-        }
+        // do not propagate event if the drop zone's inactive,
+        // for example when multiple is set to false and the user already uploaded a piece
+        if (!this.props.dropzoneInactive) {
+            let evt;
 
-        try {
-            evt = new MouseEvent('click', {
-                view: window,
-                bubbles: true,
-                cancelable: true
-            });
-        } catch(e) {
-            // For browsers that do not support the new MouseEvent syntax
-            evt = document.createEvent('MouseEvents');
-            evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80, 20, false, false, false, false, 0, null);
-        }
+            try {
+                evt = new MouseEvent('click', {
+                    view: window,
+                    bubbles: true,
+                    cancelable: true
+                });
+            } catch(e) {
+                // For browsers that do not support the new MouseEvent syntax
+                evt = document.createEvent('MouseEvents');
+                evt.initMouseEvent('click', true, true, window, 0, 0, 0, 80, 20, false, false, false, false, 0, null);
+            }
 
-        this.refs.fileSelector.getDOMNode().dispatchEvent(evt);
+            this.refs.fileSelector.getDOMNode().dispatchEvent(evt);
+        }
     },
 
     render: function () {