diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 6c10fef3d..3e54e8061 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -497,6 +497,10 @@ textarea {
 
 /* Heading */
 
+div.spacer {
+    clear: both;
+}
+
 h1 span {
     display: block;
     float: left;
diff --git a/db_details_links.php b/db_details_links.php
index b887431ce..74b71b4e9 100644
--- a/db_details_links.php
+++ b/db_details_links.php
@@ -59,7 +59,6 @@ else {
  * Displays tab links
  */
 
-echo '<div class="tabs">';
 if ($cfg['LightTabs']) {
     echo '&nbsp;';
 } else {
@@ -85,6 +84,5 @@ if (!$cfg['LightTabs']) {
 } else {
     echo '<br />';
 }
-echo '</div>';
 ?>
 <br />
diff --git a/header.inc.php b/header.inc.php
index 27c96ddc0..ec98c7ece 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -181,7 +181,7 @@ if (empty($GLOBALS['is_header_sent'])) {
         }
         echo '</h1>';
     }
-    echo "\n";
+    echo "\n" . '<div class="spacer"></div>';
 
     /**
      * Sets a variable to remember headers have been sent
diff --git a/server_links.inc.php b/server_links.inc.php
index 8ec21cf4e..bb8961ba4 100644
--- a/server_links.inc.php
+++ b/server_links.inc.php
@@ -41,7 +41,6 @@ if (!empty($message)) {
 /**
  * Displays tab links
  */
-echo '<div class="tabs">';
 if ($cfg['LightTabs']) {
     echo '&nbsp;';
 } else {
@@ -71,5 +70,4 @@ if (!$cfg['LightTabs']) {
 } else {
     echo '<br />';
 }
-echo '</div>';
 ?>
diff --git a/tbl_properties_links.php b/tbl_properties_links.php
index 9bf3121a5..5802d324a 100644
--- a/tbl_properties_links.php
+++ b/tbl_properties_links.php
@@ -65,7 +65,6 @@ $class7 = 'drop';
  * Displays links
  */
 
-echo '<div class="tabs">';
 if ($cfg['LightTabs']) {
     echo '&nbsp;';
 } else {
@@ -90,6 +89,5 @@ if (!$cfg['LightTabs']) {
 } else {
     echo '<br />';
 }
-echo '</div>';
 
 ?><br />