diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 79fdeaed6..cdc23be0f 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1589,15 +1589,18 @@ function PMA_getTab($tab)
             E_USER_NOTICE);
     }
 
+    $out = '<li' . ($tab['class'] == 'active' ? ' class="active"' : '') . '>';
+
     if (!empty($tab['link'])) {
-        $out = '<a class="tab' . htmlentities($tab['class']) . '"'
+        $out .= '<a class="tab' . htmlentities($tab['class']) . '"'
             .' href="' . $tab['link'] . '" ' . $tab['attr'] . '>'
             . $tab['text'] . '</a>';
     } else {
-        $out = '<span class="tab' . htmlentities($tab['class']) . '">'
+        $out .= '<span class="tab' . htmlentities($tab['class']) . '">'
             . $tab['text'] . '</span>';
     }
 
+    $out .= '</li>';
     return $out;
 } // end of the 'PMA_getTab()' function
 
@@ -1617,7 +1620,7 @@ function PMA_getTabs($tabs, $tag_id = 'topmenu')
         .'<ul id="' . htmlentities($tag_id) . '">' . "\n";
 
     foreach ($tabs as $tab) {
-        $tab_navigation .= '<li>' . PMA_getTab($tab) . '</li>' . "\n";
+        $tab_navigation .= PMA_getTab($tab) . "\n";
     }
 
     $tab_navigation .=
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 29e1f4ac1..8a7a8135b 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -655,7 +655,12 @@ a.tabcaution:hover,
 
 a.tab:hover,
 .tabactive {
-    background-color:   <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+}
+
+/* to be able to cancel the bottom border, use <li class="active"> */
+ul#topmenu li.active {
+     border-bottom:      1pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
 /* disabled drop/empty tabs */
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index be0e56b9a..314bb82ab 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -627,7 +627,12 @@ a.tabcaution:hover,
 
 a.tab:hover,
 .tabactive {
-    background-color:   <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+}
+
+/* to be able to cancel the bottom border, use <li class="active"> */
+ul#topmenu li.active {
+     border-bottom:      1pt solid <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
 /* disabled drop/empty tabs */