diff --git a/plupload.js b/plupload.js
index 91a5c6b..8cfb7e9 100644
--- a/plupload.js
+++ b/plupload.js
@@ -128,6 +128,7 @@ Drupal.behaviors.pluploadform = {
               };
               uploader.bind('StateChanged', stateChangedHandler);
               uploader.start();
+              e.stopImmediatePropagation();
             }
 
           });
@@ -146,6 +147,8 @@ Drupal.behaviors.pluploadform = {
 
           return false;
         });
+        // Get the plupload handler first.
+        $(this).data('events').submit.reverse();
       }
     });
   }