diff --git a/dragdropfile-parallel.js b/dragdropfile-parallel.js
index abcb329..6ecc182 100644
--- a/dragdropfile-parallel.js
+++ b/dragdropfile-parallel.js
@@ -63,7 +63,7 @@ Drupal.behaviors.dragDropFile = {
               files = Array.prototype.slice.call(e.originalEvent.dataTransfer.files),
               $input = $this.find('input.form-file').first(),
               input = $input[0],
-              $submit = $input.siblings('input[type="submit"]').first(),
+              $submit = $input.closest('.form-item').find('[type="submit"]').first(),
               $form = $submit.closest('form'),
               inputName = $input.attr('name');
 
diff --git a/dragdropfile-series.js b/dragdropfile-series.js
index d71661d..2be487f 100644
--- a/dragdropfile-series.js
+++ b/dragdropfile-series.js
@@ -128,9 +128,8 @@ Drupal.behaviors.dragDropFile = {
                 options = ajax.options,
                 $input = $wrapper.find('input.form-file').first(),
                 input = $input[0],
-                $submit = $input.siblings('input[type="submit"]').first();
-
-              inputName = $input.attr('name') || inputName;
+                $submit = $input.closest('.form-item').find('[type="submit"]').first(),
+                inputName = $input.attr('name') || inputName;
 
               // Override success callback to add something at the very end.
               var oldSuccess = options.success;