Index: javascript/plugins/media.upload_multiple.js
===================================================================
--- javascript/plugins/media.upload_multiple.js	(revision 0)
+++ javascript/plugins/media.upload_multiple.js	(revision 0)
@@ -0,0 +1,13 @@
+Drupal.behaviors.mediaUploadMultiple = {};
+
+Drupal.behaviors.mediaUploadMultiple.attach = function (context, settings) {
+  // When the plupload element initializes, it expands the size of the elements
+  // it has created, so we need to resize the browser iframe after it's done.
+  var uploader = jQuery('#edit-upload').pluploadQueue();
+  if (uploader) {
+    // Handle the case in which the uploader has already finished initializing.
+    Drupal.media.browser.resizeIframe();
+    // Handle the case in which the uploader has not yet initialized.
+    uploader.bind("PostInit", Drupal.media.browser.resizeIframe);
+  }
+};
Index: javascript/media-browser.js
===================================================================
--- javascript/media-browser.js	(revision 19199)
+++ javascript/media-browser.js	(working copy)
@@ -94,7 +94,7 @@
 };
 
 Drupal.media.browser.resizeIframe = function (event) {
-  var h = $(this).parents('body').height();
+  var h = $('body').height();
   $(parent.window.document).find('#mediaBrowser').height(h);
 };
 
Index: media.browser.inc
===================================================================
--- media.browser.inc	(revision 19199)
+++ media.browser.inc	(working copy)
@@ -219,15 +219,20 @@
   $redirect = array('media/browser', array('query' => array('render' => 'media-popup')));
   switch ($plugin_name) {
     case 'upload':
-      $upload_form_id = ($multiselect == TRUE && module_exists('plupload')) ? 'media_add_upload_multiple' : 'media_add_upload';
+      $attached = array();
+      if ($multiselect == TRUE && module_exists('plupload')) {
+        $upload_form_id = 'media_add_upload_multiple';
+        $attached['js'] = array($path . '/javascript/plugins/media.upload_multiple.js');
+      }
+      else {
+        $upload_form_id = 'media_add_upload';
+      }
       
       $upload_form = drupal_get_form($upload_form_id, $types);  
       return array(
         '#title' => t('Upload'),
         'form' => array($upload_form),
-        '#attached' => array(
-          //'js' => array($path . '/javascript/plugins/media.upload.js'),
-        ),
+        '#attached' => $attached,
       );
       break;
     case 'library':