diff --git a/modules/eb_widget/js/dropzonejs_eb_widget.ief_edit.js b/modules/eb_widget/js/dropzonejs_eb_widget.ief_edit.js
index 7d477da..28d7ec7 100644
--- a/modules/eb_widget/js/dropzonejs_eb_widget.ief_edit.js
+++ b/modules/eb_widget/js/dropzonejs_eb_widget.ief_edit.js
@@ -16,12 +16,25 @@
             var $submit = $form.find('.is-entity-browser-submit');
             $submit.prop("disabled", false);
 
-            item.instance.on("queuecomplete", function () {
+            var autoSubmitDropzone = function() {
               var $form = this;
-              $('#edit-edit', $form).trigger('mousedown');
 
-              item.instance.removeAllFiles();
-            }.bind($form));
+              // Trigger generation of IEF form only, when there are new
+              // accepted files and there are no rejected files.
+              if (item.instance.getAcceptedFiles().length > 0 && item.instance.getRejectedFiles().length === 0) {
+                $('#edit-edit', $form).trigger('mousedown');
+
+                item.instance.removeAllFiles();
+              }
+            }.bind($form);
+
+            item.instance.on("queuecomplete", function() {
+              autoSubmitDropzone();
+            });
+
+            item.instance.on("removedfile", function() {
+              autoSubmitDropzone();
+            });
           }
         });
       }