Index: javascript/media-browser.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/javascript/media-browser.js,v
retrieving revision 1.4
diff -u -p -r1.4 media-browser.js
--- javascript/media-browser.js	7 Sep 2010 19:16:42 -0000	1.4
+++ javascript/media-browser.js	16 Sep 2010 23:29:13 -0000
@@ -18,7 +18,9 @@ Drupal.behaviors.experimentalMediaBrowse
       // Fire a confirmation of some sort.
       Drupal.media.browser.finalizeSelection();
     }
-    $('#media-browser-tabset').tabs();
+    $('#media-browser-tabset').tabs({
+      show: Drupal.media.browser.resizeIframe
+    });
 
     $('.media-browser-tab').each( Drupal.media.browser.validateButtons );
 
@@ -87,4 +93,9 @@ Drupal.media.browser.finalizeSelection =
   }
 };
 
+Drupal.media.browser.resizeIframe = function (event) {
+  var h = $(this).parents('body').height();
+  $(parent.window.document).find('#mediaBrowser').height(h);
+};
+
 }(jQuery));
Index: javascript/media.popups.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/media/javascript/media.popups.js,v
retrieving revision 1.7
diff -u -p -r1.7 media.popups.js
--- javascript/media.popups.js	7 Sep 2010 19:16:42 -0000	1.7
+++ javascript/media.popups.js	16 Sep 2010 23:29:13 -0000
@@ -227,6 +227,8 @@ Drupal.media.popups.mediaFieldEditor = f
   // Create it as a modal window.
   var mediaIframe = Drupal.media.popups.getPopupIframe(options.src, 'mediaFieldEditor');
   // Attach the onLoad event
+  // @TODO - This event is firing too early in IE on Windows 7,
+  // - so the height being calculated is too short for the content.
   mediaIframe.bind('load', options, options.onLoad);
 
   /**
@@ -300,7 +302,7 @@ Drupal.media.popups.getDialogOptions = f
     resizable: false,
     minWidth: 600,
     width: 800,
-    height: 500,
+    height: 550,
     position: 'center',
     overlay: {
       backgroundColor: '#000000',
@@ -316,12 +318,16 @@ Drupal.media.popups.getDialogOptions = f
  *  The element which has .dialog() attached to it.
  */
 Drupal.media.popups.setDialogPadding = function (dialogElement) {
-  // @TODO: Perhaps remove this hardcoded reference
-  var horizontalPadding = 30;
-  var verticalPadding = 30;
-
-  dialogElement.width(dialogElement.dialog('option', 'width') - horizontalPadding);
-  dialogElement.height(dialogElement.dialog('option', 'height') - verticalPadding);
+  // @TODO: Perhaps remove this hardcoded reference to height.
+  // - It's included to make IE on Windows 7 display the dialog without
+  //   collapsing. 550 is the height that displays all of the tab panes
+  //   within the Add Media overlay. This is either a bug in the jQuery
+  //   UI library, a bug in IE on Windows 7 or a bug in the way the 
+  //   dialog is instantiated. Or a combo of the three.
+  //   All browsers except IE on Win7 ignore these defaults and adjust
+  //   the height of the iframe correctly to match the content in the panes
+  dialogElement.height(dialogElement.dialog('option', 'height'));
+  dialogElement.width(dialogElement.dialog('option', 'width'));
 };
 
 /**
