diff --git a/core/themes/seven/page.tpl.php b/core/themes/seven/page.tpl.php
index c04a187..6654a00 100644
--- a/core/themes/seven/page.tpl.php
+++ b/core/themes/seven/page.tpl.php
@@ -17,18 +17,21 @@
  */
 ?>
   <div id="branding" class="clearfix">
-    <?php print $breadcrumb; ?>
     <?php print render($title_prefix); ?>
     <?php if ($title): ?>
       <h1 class="page-title"><?php print $title; ?></h1>
     <?php endif; ?>
     <?php print render($title_suffix); ?>
     <?php print render($primary_local_tasks); ?>
+    <?php if ($secondary_local_tasks && $page['in_overlay']): ?>
+      <div class="tabs-secondary clearfix"><?php print render($secondary_local_tasks); ?></div>
+    <?php endif; ?>
+    <?php print $breadcrumb; ?>
   </div>
 
   <div id="page">
-    <?php if ($secondary_local_tasks): ?>
-      <div class="tabs-secondary clearfix"><ul class="tabs secondary"><?php print render($secondary_local_tasks); ?></ul></div>
+    <?php if ($secondary_local_tasks && !$page['in_overlay']): ?>
+      <div class="tabs-secondary clearfix"><?php print render($secondary_local_tasks); ?></div>
     <?php endif; ?>
 
     <div id="content" class="clearfix">
@@ -48,5 +51,4 @@
     <div id="footer">
       <?php print $feed_icons; ?>
     </div>
-
   </div>
diff --git a/core/themes/seven/style-rtl.css b/core/themes/seven/style-rtl.css
index e98c968..711c64b 100644
--- a/core/themes/seven/style-rtl.css
+++ b/core/themes/seven/style-rtl.css
@@ -208,8 +208,8 @@ ol.task-list li.active {
 .overlay #branding .breadcrumb {
   float: right;
 }
-.overlay ul.secondary {
-  margin: -1.4em 0 0.3em 0;
+.overlay div.tabs-secondary {
+  float: left;
 }
 
 /* Shortcut theming */
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 8d7164b..34a7fc7 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -184,6 +184,7 @@ pre {
   background-color: #e0e0d8;
 }
 #branding .breadcrumb {
+  float: left; /* LTR */
   font-size: 0.846em;
   padding-bottom: 5px;
 }
@@ -898,6 +899,7 @@ ol.task-list li.done {
   display: none;
 }
 .overlay #page {
+  clear: both;
   margin: 0;
   padding: 0 20px;
 }
@@ -915,9 +917,14 @@ ol.task-list li.done {
 #overlay-tabs li {
   margin: 0 -2px;
 }
+.overlay div.tabs-secondary {
+  clear: none;
+  float: right; /* LTR */
+}
 .overlay ul.secondary {
   background: transparent none;
-  margin: -1.4em 0 0.3em 0; /* LTR */
+  float: none;
+  margin-bottom: 0.3em;
   overflow: visible;
 }
 .overlay #content {
diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php
index a8643ab..a1be877 100644
--- a/core/themes/seven/template.php
+++ b/core/themes/seven/template.php
@@ -35,6 +35,8 @@ function seven_preprocess_page(&$vars) {
     '#theme' => 'menu_local_tasks',
     '#secondary' => $vars['tabs']['#secondary'],
   );
+  // Adds a variable to indicate that the page is rendered inside the overlay.
+  $vars['page']['in_overlay'] = (function_exists('overlay_get_mode') && overlay_get_mode() == 'child');
 }
 
 /**