diff --git a/js/media.browser.js b/js/media.browser.js
index e7a9934..30d6373 100644
--- a/js/media.browser.js
+++ b/js/media.browser.js
@@ -7,6 +7,7 @@
 namespace('Drupal.media.browser');
 
 Drupal.media.browser.selectedMedia = [];
+Drupal.media.browser.activeTab = 0;
 Drupal.media.browser.mediaAdded = function () {};
 Drupal.media.browser.selectionFinalized = function (selectedMedia) {
   // This is intended to be overridden if a callee wants to be triggered
@@ -25,8 +26,13 @@ Drupal.behaviors.experimentalMediaBrowser = {
       show: Drupal.media.browser.resizeIframe
     });
 
+    $('.ui-tabs-nav li').mouseup(function() {
+      Drupal.media.browser.activeTab = $(this).index();
+    });
+
     $('.media-browser-tab').each( Drupal.media.browser.validateButtons );
 
+    Drupal.media.browser.selectActiveTab();
     Drupal.media.browser.selectErrorTab();
 
   }
@@ -117,4 +123,12 @@ Drupal.media.browser.selectErrorTab = function() {
   }
 }
 
+Drupal.media.browser.selectActiveTab = function() {
+  // Find the index of the last active tab.
+  setTimeout(function() {
+    $('#media-browser-tabset').tabs('select', Drupal.media.browser.activeTab);
+    Drupal.media.browser.resizeIframe();
+  }, 10);
+};
+
 }(jQuery));