diff --git a/includes/media.browser.inc b/includes/media.browser.inc
index 626fc00..5341e93 100644
--- a/includes/media.browser.inc
+++ b/includes/media.browser.inc
@@ -166,6 +166,11 @@ function media_browser($selected = NULL) {
     '#markup' => t('Select a file')
   );
 
+  $output['tabset'] = array(
+    '#prefix' => '<div id="media-browser-tabset">',
+    '#suffix' => '</div>',
+  );
+
   $output['tabset']['tabs'] = array(
     '#theme' => 'menu_local_tasks',
     '#attributes' => array('class' => array('tabs', 'primary')),
diff --git a/templates/media-dialog-page.tpl.php b/templates/media-dialog-page.tpl.php
index f779c1d..33d266a 100644
--- a/templates/media-dialog-page.tpl.php
+++ b/templates/media-dialog-page.tpl.php
@@ -73,19 +73,19 @@
     <div id="media-browser-tabset">
       <div id="branding" class="clearfix">
         <div>
-          <h1><?php print render($page['content']['system_main']['title']); ?></h1>
+          <h1><?php print render($page['content']['system_main']['content']['title']); ?></h1>
         </div>
         <div id="media-tabs-wrapper">
-          <?php print render($page['content']['system_main']['tabset']['tabs']); ?>
+          <?php print render($page['content']['system_main']['content']['tabset']['tabs']); ?>
         </div>
       </div>
-      <?php print render($page['content']['system_main']['tabset']['panes']); ?>
+      <?php print render($page['content']['system_main']['content']['tabset']['panes']); ?>
     </div> <!-- /#media-tabs-set -->
   </div> <!--  /#media-browser-page -->
 </div> <!-- /#media-browser-page-wrapper -->
 
 <?php
-  hide($page['content']['system_main']['tabset']);
-  hide($page['content']['system_main']['title']);
+  hide($page['content']['system_main']['content']['tabset']);
+  hide($page['content']['system_main']['content']['title']);
   print render($page['content']);
 ?>